Re: [PATCH] md/raid1: remove unused queue

[Guoqing Jiang <gqjiang@suse.com>]

On 04/21/2017 11:52 AM, Lidong Zhong wrote:

> From: Lidong Zhong <lidong.zhong@suse.com>
>
> 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 <lidong.zhong@suse.com>
> ---
>   drivers/md/raid1.c | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
> index a34f587..559f848 100644
> --- a/drivers/md/raid1.c
> +++ b/drivers/md/raid1.c
> @@ -3064,7 +3064,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)
> @@ -3077,8 +3076,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;
>   	}

Seems commit 8ae12666 "block: kill merge_bvec_fn() completely" forgot to
kill them. I think we can remove similar code from raid10 as well.

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e3fd725..00a2d25f 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3565,7 +3565,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)
@@ -3584,7 +3583,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;

Lidong, care to send a new version to include raid10 part? Thanks.

Cheers,
Guoqing