Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29661758 authored by Lidong Zhong's avatar Lidong Zhong Committed by Shaohua Li
Browse files

md/raid1/10: remove unused queue 



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: default avatarLidong Zhong <lzhong@suse.com>
Acted-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 97b20ef7

drivers/md/raid1.c

+0 −3
Original line number Diff line number Diff line
@@ -2961,7 +2961,6 @@ static struct r1conf *setup_conf(struct mddev *mddev) 
	err = -EINVAL;

	spin_lock_init(&conf->device_lock);

	rdev_for_each(rdev, mddev) {

		struct request_queue *q;

		int disk_idx = rdev->raid_disk;

		if (disk_idx >= mddev->raid_disks

		    || disk_idx < 0)
@@ -2974,8 +2973,6 @@ static struct r1conf *setup_conf(struct mddev *mddev) 
		if (disk->rdev)

			goto abort;

		disk->rdev = rdev;

		q = bdev_get_queue(rdev->bdev);



		disk->head_position = 0;

		disk->seq_start = MaxSector;

	}

drivers/md/raid10.c

+0 −2
Original line number Diff line number Diff line
@@ -3644,7 +3644,6 @@ static int raid10_run(struct mddev *mddev) 


	rdev_for_each(rdev, mddev) {

		long long diff;

		struct request_queue *q;



		disk_idx = rdev->raid_disk;

		if (disk_idx < 0)
@@ -3663,7 +3662,6 @@ static int raid10_run(struct mddev *mddev) 
				goto out_free_conf;

			disk->rdev = rdev;

		}

		q = bdev_get_queue(rdev->bdev);

		diff = (rdev->new_data_offset - rdev->data_offset);

		if (!mddev->reshape_backwards)

			diff = -diff;