diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 20:35:32 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-11-09 20:35:32 -0500 |
| commit | 31846dbfd1f9dd51ca873c427ab6e941db277cad (patch) | |
| tree | 6ff56b17dc22216eb4e367daf8023760cea096b2 | |
| parent | 78998fef3c1fbf3c3d608ce093e4d77922b260a0 (diff) | |
| download | longterm-queue-4.8-31846dbfd1f9dd51ca873c427ab6e941db277cad.tar.gz | |
blk: refresh for args count change
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/dm-rq-check-blk_mq_register_dev-return-value-in-dm_m.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/dm-rq-check-blk_mq_register_dev-return-value-in-dm_m.patch b/queue/dm-rq-check-blk_mq_register_dev-return-value-in-dm_m.patch index 45ba709..10363c0 100644 --- a/queue/dm-rq-check-blk_mq_register_dev-return-value-in-dm_m.patch +++ b/queue/dm-rq-check-blk_mq_register_dev-return-value-in-dm_m.patch @@ -1,4 +1,4 @@ -From 23a601248958fa4142d49294352fe8d1fdf3e509 Mon Sep 17 00:00:00 2001 +From 2d4fae89501a62154dbb368b26dfd18a9541bdd2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bart.vanassche@sandisk.com> Date: Thu, 27 Apr 2017 10:11:19 -0700 Subject: [PATCH] dm rq: check blk_mq_register_dev() return value in @@ -16,15 +16,15 @@ Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Mike Snitzer <snitzer@redhat.com> diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c -index 90756a56c4d3..a6e8da9da7a4 100644 +index 843f898e6231..f8e03da6858d 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c -@@ -809,10 +809,14 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t) +@@ -977,10 +977,14 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t) dm_init_md_queue(md); /* backfill 'mq' sysfs registration normally done in blk_register_queue */ -- blk_mq_register_dev(disk_to_dev(md->disk), q); -+ err = blk_mq_register_dev(disk_to_dev(md->disk), q); +- blk_mq_register_disk(md->disk); ++ err = blk_mq_register_disk(md->disk); + if (err) + goto out_cleanup_queue; |