kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

md/raid1/10: remove unused queue

Browse source 
A queue is declared and get from the disk of the array, but it's not
used anywhere. So removing it from the source.

Signed-off-by: Lidong Zhong <lzhong@suse.com>
Acted-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
This commit is contained in:
Lidong Zhong 2017-04-21 15:21:38 +08:00 committed by Shaohua Li
parent 97b20ef784
commit 296617581e
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/md/raid1.c
View file

@ -2961,7 +2961,6 @@ static struct r1conf *setup_conf(struct mddev *mddev)
err = -EINVAL; err = -EINVAL;
spin_lock_init(&conf->device_lock); spin_lock_init(&conf->device_lock);
rdev_for_each(rdev, mddev) { rdev_for_each(rdev, mddev) {
struct request_queue *q;
int disk_idx = rdev->raid_disk; int disk_idx = rdev->raid_disk;
if (disk_idx >= mddev->raid_disks if (disk_idx >= mddev->raid_disks
|| disk_idx < 0) || disk_idx < 0)
@ -2974,8 +2973,6 @@ static struct r1conf *setup_conf(struct mddev *mddev)
if (disk->rdev) if (disk->rdev)
goto abort; goto abort;
disk->rdev = rdev; disk->rdev = rdev;
q = bdev_get_queue(rdev->bdev);
disk->head_position = 0; disk->head_position = 0;
disk->seq_start = MaxSector; disk->seq_start = MaxSector;
} }

2
drivers/md/raid10.c
View file

@ -3644,7 +3644,6 @@ static int raid10_run(struct mddev *mddev)
rdev_for_each(rdev, mddev) { rdev_for_each(rdev, mddev) {
long long diff; long long diff;
struct request_queue *q;
disk_idx = rdev->raid_disk; disk_idx = rdev->raid_disk;
if (disk_idx < 0) if (disk_idx < 0)
@ -3663,7 +3662,6 @@ static int raid10_run(struct mddev *mddev)
goto out_free_conf; goto out_free_conf;
disk->rdev = rdev; disk->rdev = rdev;
} }
q = bdev_get_queue(rdev->bdev);
diff = (rdev->new_data_offset - rdev->data_offset); diff = (rdev->new_data_offset - rdev->data_offset);
if (!mddev->reshape_backwards) if (!mddev->reshape_backwards)
diff = -diff; diff = -diff;