* [PATCH] NVMe: Fix incompatible pointer type warnings
@ 2013-05-17 14:09 Emil Goode
2013-05-17 14:45 ` Matthew Wilcox
0 siblings, 1 reply; 4+ messages in thread
From: Emil Goode @ 2013-05-17 14:09 UTC (permalink / raw)
To: willy, keith.busch, vishal.l.verma
Cc: linux-nvme, linux-kernel, kernel-janitors, 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.
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 <emilgoode@gmail.com>
---
drivers/block/nvme-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 8efdfaa..9380133 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -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;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] NVMe: Fix incompatible pointer type warnings
2013-05-17 14:09 [PATCH] NVMe: Fix incompatible pointer type warnings Emil Goode
@ 2013-05-17 14:45 ` Matthew Wilcox
2013-05-17 15:08 ` Dan Carpenter
2013-05-17 15:22 ` Emil Goode
0 siblings, 2 replies; 4+ messages in thread
From: Matthew Wilcox @ 2013-05-17 14:45 UTC (permalink / raw)
To: Emil Goode
Cc: keith.busch, vishal.l.verma, linux-nvme, linux-kernel,
kernel-janitors
On Fri, May 17, 2013 at 04:09:40PM +0200, Emil Goode wrote:
> 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.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] NVMe: Fix incompatible pointer type warnings
2013-05-17 14:45 ` Matthew Wilcox
@ 2013-05-17 15:08 ` Dan Carpenter
2013-05-17 15:22 ` Emil Goode
1 sibling, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2013-05-17 15:08 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Emil Goode, keith.busch, vishal.l.verma, linux-nvme, linux-kernel,
kernel-janitors, Kent Overstreet, Andrew Morton
On Fri, May 17, 2013 at 10:45:26AM -0400, Matthew Wilcox wrote:
> On Fri, May 17, 2013 at 04:09:40PM +0200, Emil Goode wrote:
> > 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] NVMe: Fix incompatible pointer type warnings
2013-05-17 14:45 ` Matthew Wilcox
2013-05-17 15:08 ` Dan Carpenter
@ 2013-05-17 15:22 ` Emil Goode
1 sibling, 0 replies; 4+ messages in thread
From: Emil Goode @ 2013-05-17 15:22 UTC (permalink / raw)
To: Matthew Wilcox
Cc: keith.busch, vishal.l.verma, linux-nvme, linux-kernel,
kernel-janitors
I see, I will resend and include Andrew Morton.
Thanks,
Emil
On Fri, May 17, 2013 at 10:45:26AM -0400, Matthew Wilcox wrote:
> On Fri, May 17, 2013 at 04:09:40PM +0200, Emil Goode wrote:
> > 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-17 15:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-17 14:09 [PATCH] NVMe: Fix incompatible pointer type warnings Emil Goode
2013-05-17 14:45 ` Matthew Wilcox
2013-05-17 15:08 ` Dan Carpenter
2013-05-17 15:22 ` Emil Goode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox