NVMe: Fix incompatible pointer type warnings

PATCH Superseded Emil Goode 3 participants 4 messages May 17, 2013

Subsystems (3)

Block layer Kernel janitors NVMe

lore

Share & tools

lore

Emil Goode

author

2013-05-17 14:09 UTC #0 lore raw

PATCH 1/1 NVMe: Fix incompatible pointer type warnings

Commit 6a4d55146334 ("block: prep work for batch completion") added a struct batch_complete * as a third argument to bi_end_io. This patch adds the missing third argument to the nvme_bio_pair_endio function.

Sparse output:

drivers/block/nvme-core.c: In function ‘nvme_bio_split’:
drivers/block/nvme-core.c:483:19: warning:
assignment from incompatible pointer type [enabled by default]
drivers/block/nvme-core.c:484:19: warning:
assignment from incompatible pointer type [enabled by default]

Signed-off-by Emil Goode <[email protected]>

---
 drivers/block/nvme-core.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/block/nvme-core.c +2 -1

index 8efdfaa..9380133 100644
@@ -413,7 +413,8 @@ struct nvme_bio_pair {
 	atomic_t cnt;
 };
 
-static void nvme_bio_pair_endio(struct bio *bio, int err)
+static void nvme_bio_pair_endio(struct bio *bio, int err,
+						struct batch_complete *batch)
 {
 	struct nvme_bio_pair *bp = bio->bi_private;

Signature · 1 line

1.7.10.4

Matthew Wilcox

2013-05-17 14:45 UTC #1 lore raw

Quoted 4 lines · Emil Goode

Commit 6a4d55146334 ("block: prep work for batch completion") added a struct batch_complete * as a third argument to bi_end_io. This patch adds the missing third argument to the nvme_bio_pair_endio function.

That patch isn't in Linus' tree yet, so we can't apply this patch. It needs to go to linux-next.

Dan Carpenter

2013-05-17 15:08 UTC #2 lore raw

Quoted 8 lines · Matthew Wilcox

Quoted 4 lines · Emil Goode
Commit 6a4d55146334 ("block: prep work for batch completion") added a struct batch_complete * as a third argument to bi_end_io. This patch adds the missing third argument to the nvme_bio_pair_endio function.
That patch isn't in Linus' tree yet, so we can't apply this patch. It needs to go to linux-next.

The 6a4d55146334 ("block: prep work for batch completion") is from the -mm tree.

regards,
dan carpenter

Emil Goode

author

2013-05-17 15:22 UTC #3 lore raw

In reply to Matthew Wilcox

I see, I will resend and include Andrew Morton.

Thanks,

Emil

Quoted 8 lines · Matthew Wilcox

Quoted 4 lines · Emil Goode
Commit 6a4d55146334 ("block: prep work for batch completion") added a struct batch_complete * as a third argument to bi_end_io. This patch adds the missing third argument to the nvme_bio_pair_endio function.
That patch isn't in Linus' tree yet, so we can't apply this patch. It needs to go to linux-next.