* linux-next: build warning after merge of the final tree (akpm and block tree related)
@ 2013-03-26 6:05 Stephen Rothwell
2013-03-26 19:55 ` Kent Overstreet
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-03-26 6:05 UTC (permalink / raw)
To: Jens Axboe, Andrew Morton; +Cc: linux-next, linux-kernel, Kent Overstreet
[-- Attachment #1: Type: text/plain, Size: 2570 bytes --]
Hi all,
After merging the final tree, today's linux-next build
produced this warning:
fs/bio.c: In function 'submit_bio_wait':
fs/bio.c:786:17: warning: assignment from incompatible pointer type [enabled by default]
This is due to an interaction between commit 9e882242c ("block: Add
submit_bio_wait(), remove from md") from the block tree and commit
"block: prep work for batch completion" from the akpm tree.
In fact we are getting several more warnings due to that patch in the
akpm tree:
drivers/md/bcache/writeback.c: In function 'write_dirty':
drivers/md/bcache/writeback.c:276:20: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/writeback.c: In function 'read_dirty':
drivers/md/bcache/writeback.c:350:21: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/movinggc.c: In function 'read_moving':
drivers/md/bcache/movinggc.c:160:18: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/request.c: In function 'bch_insert_data_loop':
drivers/md/bcache/request.c:518:16: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/request.c: In function 'do_bio_hook':
drivers/md/bcache/request.c:684:18: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/request.c: In function 'cached_dev_cache_miss':
drivers/md/bcache/request.c:926:19: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/request.c:957:29: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/debug.c: In function 'bch_data_verify':
drivers/md/bcache/debug.c:208:19: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/super.c: In function 'bch_write_bdev_super':
drivers/md/bcache/super.c:257:17: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/super.c: In function 'bcache_write_super':
drivers/md/bcache/super.c:295:18: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/super.c: In function 'uuid_io':
drivers/md/bcache/super.c:333:18: warning: assignment from incompatible pointer type [enabled by default]
drivers/md/bcache/super.c: In function 'prio_io':
drivers/md/bcache/super.c:492:17: warning: assignment from incompatible pointer type [enabled by default]
There are probably more ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build warning after merge of the final tree (akpm and block tree related)
2013-03-26 6:05 linux-next: build warning after merge of the final tree (akpm and block tree related) Stephen Rothwell
@ 2013-03-26 19:55 ` Kent Overstreet
2013-03-26 20:10 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Kent Overstreet @ 2013-03-26 19:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jens Axboe, Andrew Morton, linux-next, linux-kernel
On Tue, Mar 26, 2013 at 05:05:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build
> produced this warning:
>
> fs/bio.c: In function 'submit_bio_wait':
> fs/bio.c:786:17: warning: assignment from incompatible pointer type [enabled by default]
>
> This is due to an interaction between commit 9e882242c ("block: Add
> submit_bio_wait(), remove from md") from the block tree and commit
> "block: prep work for batch completion" from the akpm tree.
In hindsight maybe it would've been better if the batch completion stuff
had gone in via Jens' tree, though I'm sure there would've still been
some conflicts.
What's the procedure for me to fix these? I can send you a fixup patch
but if you've pushed this version of linux-next somewhere public I'm not
sure where to look.
>
> In fact we are getting several more warnings due to that patch in the
> akpm tree:
>
> drivers/md/bcache/writeback.c: In function 'write_dirty':
> drivers/md/bcache/writeback.c:276:20: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/writeback.c: In function 'read_dirty':
> drivers/md/bcache/writeback.c:350:21: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/movinggc.c: In function 'read_moving':
> drivers/md/bcache/movinggc.c:160:18: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/request.c: In function 'bch_insert_data_loop':
> drivers/md/bcache/request.c:518:16: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/request.c: In function 'do_bio_hook':
> drivers/md/bcache/request.c:684:18: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/request.c: In function 'cached_dev_cache_miss':
> drivers/md/bcache/request.c:926:19: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/request.c:957:29: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/debug.c: In function 'bch_data_verify':
> drivers/md/bcache/debug.c:208:19: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/super.c: In function 'bch_write_bdev_super':
> drivers/md/bcache/super.c:257:17: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/super.c: In function 'bcache_write_super':
> drivers/md/bcache/super.c:295:18: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/super.c: In function 'uuid_io':
> drivers/md/bcache/super.c:333:18: warning: assignment from incompatible pointer type [enabled by default]
> drivers/md/bcache/super.c: In function 'prio_io':
> drivers/md/bcache/super.c:492:17: warning: assignment from incompatible pointer type [enabled by default]
>
> There are probably more ...
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build warning after merge of the final tree (akpm and block tree related)
2013-03-26 19:55 ` Kent Overstreet
@ 2013-03-26 20:10 ` Andrew Morton
2013-03-26 21:35 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2013-03-26 20:10 UTC (permalink / raw)
To: Kent Overstreet; +Cc: Stephen Rothwell, Jens Axboe, linux-next, linux-kernel
On Tue, 26 Mar 2013 12:55:23 -0700 Kent Overstreet <koverstreet@google.com> wrote:
> On Tue, Mar 26, 2013 at 05:05:54PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the final tree, today's linux-next build
> > produced this warning:
> >
> > fs/bio.c: In function 'submit_bio_wait':
> > fs/bio.c:786:17: warning: assignment from incompatible pointer type [enabled by default]
> >
> > This is due to an interaction between commit 9e882242c ("block: Add
> > submit_bio_wait(), remove from md") from the block tree and commit
> > "block: prep work for batch completion" from the akpm tree.
>
> In hindsight maybe it would've been better if the batch completion stuff
> had gone in via Jens' tree, though I'm sure there would've still been
> some conflicts.
>
> What's the procedure for me to fix these? I can send you a fixup patch
> but if you've pushed this version of linux-next somewhere public I'm not
> sure where to look.
Stephen and I quietly fix up this sort of thing.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build warning after merge of the final tree (akpm and block tree related)
2013-03-26 20:10 ` Andrew Morton
@ 2013-03-26 21:35 ` Stephen Rothwell
2013-03-26 21:43 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-03-26 21:35 UTC (permalink / raw)
To: Andrew Morton; +Cc: Kent Overstreet, Jens Axboe, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
Hi Guys,
On Tue, 26 Mar 2013 13:10:51 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Tue, 26 Mar 2013 12:55:23 -0700 Kent Overstreet <koverstreet@google.com> wrote:
>
> > On Tue, Mar 26, 2013 at 05:05:54PM +1100, Stephen Rothwell wrote:
> > >
> > > After merging the final tree, today's linux-next build
> > > produced this warning:
> > >
> > > fs/bio.c: In function 'submit_bio_wait':
> > > fs/bio.c:786:17: warning: assignment from incompatible pointer type [enabled by default]
> > >
> > > This is due to an interaction between commit 9e882242c ("block: Add
> > > submit_bio_wait(), remove from md") from the block tree and commit
> > > "block: prep work for batch completion" from the akpm tree.
> >
> > In hindsight maybe it would've been better if the batch completion stuff
> > had gone in via Jens' tree, though I'm sure there would've still been
> > some conflicts.
> >
> > What's the procedure for me to fix these? I can send you a fixup patch
> > but if you've pushed this version of linux-next somewhere public I'm not
> > sure where to look.
>
> Stephen and I quietly fix up this sort of thing.
Yeah, though a hint might be nice. It looks like these completion
routines just need the batch argument added, right?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build warning after merge of the final tree (akpm and block tree related)
2013-03-26 21:35 ` Stephen Rothwell
@ 2013-03-26 21:43 ` Andrew Morton
2013-03-26 22:05 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2013-03-26 21:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Kent Overstreet, Jens Axboe, linux-next, linux-kernel
On Wed, 27 Mar 2013 08:35:35 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Guys,
>
> On Tue, 26 Mar 2013 13:10:51 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Tue, 26 Mar 2013 12:55:23 -0700 Kent Overstreet <koverstreet@google.com> wrote:
> >
> > > On Tue, Mar 26, 2013 at 05:05:54PM +1100, Stephen Rothwell wrote:
> > > >
> > > > After merging the final tree, today's linux-next build
> > > > produced this warning:
> > > >
> > > > fs/bio.c: In function 'submit_bio_wait':
> > > > fs/bio.c:786:17: warning: assignment from incompatible pointer type [enabled by default]
> > > >
> > > > This is due to an interaction between commit 9e882242c ("block: Add
> > > > submit_bio_wait(), remove from md") from the block tree and commit
> > > > "block: prep work for batch completion" from the akpm tree.
> > >
> > > In hindsight maybe it would've been better if the batch completion stuff
> > > had gone in via Jens' tree, though I'm sure there would've still been
> > > some conflicts.
> > >
> > > What's the procedure for me to fix these? I can send you a fixup patch
> > > but if you've pushed this version of linux-next somewhere public I'm not
> > > sure where to look.
> >
> > Stephen and I quietly fix up this sort of thing.
>
> Yeah, though a hint might be nice. It looks like these completion
> routines just need the batch argument added, right?
yup.
From: Andrew Morton <akpm@linux-foundation.org>
Subject: block-prep-work-for-batch-completion-fix-2
fs/bio.c: In function 'submit_bio_wait':
fs/bio.c:786: warning: assignment from incompatible pointer type
Cc: Kent Overstreet <koverstreet@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/bio.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN fs/bio.c~block-prep-work-for-batch-completion-fix-2 fs/bio.c
--- a/fs/bio.c~block-prep-work-for-batch-completion-fix-2
+++ a/fs/bio.c
@@ -760,7 +760,8 @@ struct submit_bio_ret {
int error;
};
-static void submit_bio_wait_endio(struct bio *bio, int error)
+static void submit_bio_wait_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct submit_bio_ret *ret = bio->bi_private;
_
From: Andrew Morton <akpm@linux-foundation.org>
Subject: block-prep-work-for-batch-completion-fix-3
Cc: Kent Overstreet <koverstreet@google.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/md/bcache/btree.c | 3 ++-
drivers/md/bcache/io.c | 6 ++++--
drivers/md/bcache/journal.c | 9 ++++++---
drivers/md/bcache/movinggc.c | 3 ++-
drivers/md/bcache/request.c | 9 ++++++---
drivers/md/bcache/request.h | 3 +--
drivers/md/bcache/super.c | 11 +++++++----
drivers/md/bcache/writeback.c | 8 +++++---
8 files changed, 33 insertions(+), 19 deletions(-)
diff -puN drivers/md/bcache/btree.c~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/btree.c
--- a/drivers/md/bcache/btree.c~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/btree.c
@@ -133,7 +133,8 @@ static uint64_t btree_csum_set(struct bt
return crc ^ 0xffffffffffffffff;
}
-static void btree_bio_endio(struct bio *bio, int error)
+static void btree_bio_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct closure *cl = bio->bi_private;
struct btree *b = container_of(cl, struct btree, io.cl);
diff -puN drivers/md/bcache/io.c~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/io.c
--- a/drivers/md/bcache/io.c~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/io.c
@@ -9,7 +9,8 @@
#include "bset.h"
#include "debug.h"
-static void bch_bi_idx_hack_endio(struct bio *bio, int error)
+static void bch_bi_idx_hack_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct bio *p = bio->bi_private;
@@ -199,7 +200,8 @@ static void bch_bio_submit_split_done(st
mempool_free(s, s->p->bio_split_hook);
}
-static void bch_bio_submit_split_endio(struct bio *bio, int error)
+static void bch_bio_submit_split_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct closure *cl = bio->bi_private;
struct bio_split_hook *s = container_of(cl, struct bio_split_hook, cl);
diff -puN drivers/md/bcache/journal.c~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/journal.c
--- a/drivers/md/bcache/journal.c~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/journal.c
@@ -22,7 +22,8 @@
* bit.
*/
-static void journal_read_endio(struct bio *bio, int error)
+static void journal_read_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct closure *cl = bio->bi_private;
closure_put(cl);
@@ -390,7 +391,8 @@ found:
#define last_seq(j) ((j)->seq - fifo_used(&(j)->pin) + 1)
-static void journal_discard_endio(struct bio *bio, int error)
+static void journal_discard_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct journal_device *ja =
container_of(bio, struct journal_device, discard_bio);
@@ -535,7 +537,8 @@ void bch_journal_next(struct journal *j)
pr_debug("journal_pin full (%zu)", fifo_used(&j->pin));
}
-static void journal_write_endio(struct bio *bio, int error)
+static void journal_write_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct journal_write *w = bio->bi_private;
diff -puN drivers/md/bcache/movinggc.c~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/movinggc.c
--- a/drivers/md/bcache/movinggc.c~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/movinggc.c
@@ -61,7 +61,8 @@ static void write_moving_finish(struct c
closure_return_with_destructor(cl, moving_io_destructor);
}
-static void read_moving_endio(struct bio *bio, int error)
+static void read_moving_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct moving_io *io = container_of(bio->bi_private,
struct moving_io, s.cl);
diff -puN drivers/md/bcache/request.c~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/request.c
--- a/drivers/md/bcache/request.c~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/request.c
@@ -456,7 +456,8 @@ static void bch_insert_data_error(struct
bch_journal(cl);
}
-static void bch_insert_data_endio(struct bio *bio, int error)
+static void bch_insert_data_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct closure *cl = bio->bi_private;
struct btree_op *op = container_of(cl, struct btree_op, cl);
@@ -621,7 +622,8 @@ void bch_btree_insert_async(struct closu
/* Common code for the make_request functions */
-static void request_endio(struct bio *bio, int error)
+static void request_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct closure *cl = bio->bi_private;
@@ -636,7 +638,8 @@ static void request_endio(struct bio *bi
closure_put(cl);
}
-void bch_cache_read_endio(struct bio *bio, int error)
+void bch_cache_read_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct bbio *b = container_of(bio, struct bbio, bio);
struct closure *cl = bio->bi_private;
diff -puN drivers/md/bcache/request.h~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/request.h
--- a/drivers/md/bcache/request.h~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/request.h
@@ -29,11 +29,10 @@ struct search {
struct btree_op op;
};
-void bch_cache_read_endio(struct bio *, int);
+void bch_cache_read_endio(struct bio *, int, struct batch_complete *batch);
int bch_get_congested(struct cache_set *);
void bch_insert_data(struct closure *cl);
void bch_btree_insert_async(struct closure *);
-void bch_cache_read_endio(struct bio *, int);
void bch_open_buckets_free(struct cache_set *);
int bch_open_buckets_alloc(struct cache_set *);
diff -puN drivers/md/bcache/super.c~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/super.c
--- a/drivers/md/bcache/super.c~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/super.c
@@ -202,7 +202,8 @@ err:
return err;
}
-static void write_bdev_super_endio(struct bio *bio, int error)
+static void write_bdev_super_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct cached_dev *dc = bio->bi_private;
/* XXX: error checking */
@@ -263,7 +264,8 @@ void bch_write_bdev_super(struct cached_
closure_return(cl);
}
-static void write_super_endio(struct bio *bio, int error)
+static void write_super_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct cache *ca = bio->bi_private;
@@ -304,7 +306,7 @@ void bcache_write_super(struct cache_set
/* UUID io */
-static void uuid_endio(struct bio *bio, int error)
+static void uuid_endio(struct bio *bio, int error, struct batch_complete *batch)
{
struct closure *cl = bio->bi_private;
struct cache_set *c = container_of(cl, struct cache_set, uuid_write.cl);
@@ -468,7 +470,8 @@ static struct uuid_entry *uuid_find_empt
* disk.
*/
-static void prio_endio(struct bio *bio, int error)
+static void prio_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct cache *ca = bio->bi_private;
diff -puN drivers/md/bcache/writeback.c~block-prep-work-for-batch-completion-fix-3 drivers/md/bcache/writeback.c
--- a/drivers/md/bcache/writeback.c~block-prep-work-for-batch-completion-fix-3
+++ a/drivers/md/bcache/writeback.c
@@ -253,7 +253,8 @@ static void write_dirty_finish(struct cl
closure_return_with_destructor(cl, dirty_io_destructor);
}
-static void dirty_endio(struct bio *bio, int error)
+static void dirty_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct keybuf_key *w = bio->bi_private;
struct dirty_io *io = w->private;
@@ -281,7 +282,8 @@ static void write_dirty(struct closure *
continue_at(cl, write_dirty_finish, dirty_wq);
}
-static void read_dirty_endio(struct bio *bio, int error)
+static void read_dirty_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct keybuf_key *w = bio->bi_private;
struct dirty_io *io = w->private;
@@ -289,7 +291,7 @@ static void read_dirty_endio(struct bio
bch_count_io_errors(PTR_CACHE(io->dc->disk.c, &w->key, 0),
error, "reading dirty data from cache");
- dirty_endio(bio, error);
+ dirty_endio(bio, error, NULL);
}
static void read_dirty_submit(struct closure *cl)
_
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build warning after merge of the final tree (akpm and block tree related)
2013-03-26 21:43 ` Andrew Morton
@ 2013-03-26 22:05 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2013-03-26 22:05 UTC (permalink / raw)
To: Andrew Morton; +Cc: Kent Overstreet, Jens Axboe, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Hi Andrew,
On Tue, 26 Mar 2013 14:43:32 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 27 Mar 2013 08:35:35 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Yeah, though a hint might be nice. It looks like these completion
> > routines just need the batch argument added, right?
>
> yup.
>
> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: block-prep-work-for-batch-completion-fix-2
Good hint :-)
I will add these to the akpm tree. Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-03-26 22:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-26 6:05 linux-next: build warning after merge of the final tree (akpm and block tree related) Stephen Rothwell
2013-03-26 19:55 ` Kent Overstreet
2013-03-26 20:10 ` Andrew Morton
2013-03-26 21:35 ` Stephen Rothwell
2013-03-26 21:43 ` Andrew Morton
2013-03-26 22:05 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).