[PATCH] dm: drop unnecessary assignment of md->queue

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Bob Liu <bob.liu@oracle.com>
Newsgroups	linux.kernel
Subject	[PATCH] dm: drop unnecessary assignment of md->queue
Date	Wed, 24 Feb 2016 09:20:02 +0100
Message-ID	<r5CPU-1G8-9@gated-at.bofh.it> (permalink)
X-Original-To	linux-kernel@vger.kernel.org
X-Mailer	git-send-email 1.7.10.4
X-Source-IP	userv0021.oracle.com [156.151.31.71]
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
X-Original-Cc	snitzer@redhat.com, mpatocka@redhat.com, axboe@fb.com, j-nomura@ce.jp.nec.com, neilb@suse.com, Bob Liu <bob.liu@oracle.com>
X-Original-Date	Wed, 24 Feb 2016 16:15:38 +0800
X-Original-Message-ID	<1456301738-16076-1-git-send-email-bob.liu@oracle.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1341634

Show key headers only | View raw

md->queue and q are the same thing in dm_init_request_based_queue() and
dm_init_request_based_blk_mq_queue().

Also drop the temporary struct request_queue *q.

Signed-off-by: Bob Liu <bob.liu@oracle.com>
---
 drivers/md/dm.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 5df4048..4f1f317 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2605,17 +2605,13 @@ static void init_rq_based_worker_thread(struct mapped_device *md)
  */
 static int dm_init_request_based_queue(struct mapped_device *md)
 {
-	struct request_queue *q = NULL;
-
 	/* Fully initialize the queue */
-	q = blk_init_allocated_queue(md->queue, dm_request_fn, NULL);
-	if (!q)
+	if (!blk_init_allocated_queue(md->queue, dm_request_fn, NULL))
 		return -EINVAL;
 
 	/* disable dm_request_fn's merge heuristic by default */
 	md->seq_rq_merge_deadline_usecs = 0;
 
-	md->queue = q;
 	dm_init_old_md_queue(md);
 	blk_queue_softirq_done(md->queue, dm_softirq_done);
 	blk_queue_prep_rq(md->queue, dm_prep_fn);
@@ -2740,7 +2736,6 @@ static int dm_init_request_based_blk_mq_queue(struct mapped_device *md)
 		err = PTR_ERR(q);
 		goto out_tag_set;
 	}
-	md->queue = q;
 	dm_init_md_queue(md);
 
 	/* backfill 'mq' sysfs registration normally done in blk_register_queue */
-- 
1.7.10.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] dm: drop unnecessary assignment of md->queue Bob Liu <bob.liu@oracle.com> - 2016-02-24 09:20 +0100
  Re: dm: drop unnecessary assignment of md->queue Mike Snitzer <snitzer@redhat.com> - 2016-02-24 18:00 +0100

csiph-web