aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-18 15:41:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-18 15:41:27 -0800
commit93c3d65b28bab6da520c2add9cb387a0303f8b2d (patch)
treed53d83ffe07d4237e1f8b1b6f02fa0362d8dacd2
parent9ef9b20bd0eef609f07960a997c13cab8fe15d2e (diff)
downloadvexpress-lsk-93c3d65b28bab6da520c2add9cb387a0303f8b2d.tar.gz
nvme: fix merge error due to change of 'make_request_fn' fn type
The type of 'make_request_fn' changed in 5a7bbad27a4 ("block: remove support for bio remapping from ->make_request"), but the merge of the nvme driver didn't take that into account, and as a result the driver would compile with a warning: drivers/block/nvme.c: In function 'nvme_alloc_ns': drivers/block/nvme.c:1336:2: warning: passing argument 2 of 'blk_queue_make_request' from incompatible pointer type [enabled by default] include/linux/blkdev.h:830:13: note: expected 'void (*)(struct request_queue *, struct bio *)' but argument is of type 'int (*)(struct request_queue *, struct bio *)' It's benign, but the warning is annoying. Reported-by: Stephen Rothwell <sfr@canb.auug.org> Cc: Matthew Wilcox <matthew.r.wilcox@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/nvme.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index f4996b0e4b1..c1dc4d86c22 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -613,11 +613,7 @@ static int nvme_submit_bio_queue(struct nvme_queue *nvmeq, struct nvme_ns *ns,
return result;
}
-/*
- * NB: return value of non-zero would mean that we were a stacking driver.
- * make_request must always succeed.
- */
-static int nvme_make_request(struct request_queue *q, struct bio *bio)
+static void nvme_make_request(struct request_queue *q, struct bio *bio)
{
struct nvme_ns *ns = q->queuedata;
struct nvme_queue *nvmeq = get_nvmeq(ns->dev);
@@ -634,8 +630,6 @@ static int nvme_make_request(struct request_queue *q, struct bio *bio)
spin_unlock_irq(&nvmeq->q_lock);
put_nvmeq(nvmeq);
-
- return 0;
}
static irqreturn_t nvme_process_cq(struct nvme_queue *nvmeq)