2013-05-17 14:10:04

by Emil Goode

Subject: [PATCH] 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(-)

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

2013-05-17 14:45:49

by Matthew Wilcox

Subject: Re: [PATCH] NVMe: Fix incompatible pointer type warnings

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.

2013-05-17 15:08:46

by Dan Carpenter

Subject: Re: [PATCH] NVMe: Fix incompatible pointer type warnings

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

2013-05-17 15:22:53

by Emil Goode

Subject: Re: [PATCH] NVMe: Fix incompatible pointer type warnings

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.