Messages in this thread Patch in this message | | | From | Chris Mason <> | Subject | Re: linux-next: manual merge of the akpm tree with Linus' tree | Date | Mon, 20 May 2013 08:19:52 -0400 |
| |
Quoting Stephen Rothwell (2013-05-20 00:04:49) > Hi Andrew, > > Today's linux-next merge of the akpm tree got conflicts in > fs/btrfs/inode.c and fs/btrfs/volumes.c between commit 9be3395bcd4a > ("Btrfs: use a btrfs bioset instead of abusing bio internals") from > Linus' tree and commit "block: prep work for batch completion" from the > akpm tree. > > I fixed it up (I think - see below) and can carry the fix as necessary > (no action is required). > > I also noticed that a single conversion of bio_endio to bio_endio_batch > is done in the akpm patch but bio_endio_batch is not introduced until a > later patch ... :-(
Thanks, this looks right and I've linux-next through an aio/dio test on btrfs.
Kent, reviewing the merge I see a missing bio_endio_batch conversion. I think this was missing from the original:
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index faf20f5..a47bc10 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7084,7 +7084,7 @@ static void btrfs_end_dio_bio(struct bio *bio, int err, bio_io_error(dip->orig_bio); } else { set_bit(BIO_UPTODATE, &dip->dio_bio->bi_flags); - bio_endio(dip->orig_bio, 0); + bio_endio_batch(dip->orig_bio, 0, batch); } out: bio_put(bio);
| |