From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, David Sterba <dsterba@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jeff Mahoney <jeffm@suse•com>
Subject: linux-next: manual merge of the block tree with the btrfs-kdave tree
Date: Fri, 8 Jul 2016 13:27:36 +1000 [thread overview]
Message-ID: <20160708132736.2509cbea@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/disk-io.c
between commit:
b286384aac32 ("btrfs: root->fs_info cleanup, add fs_info convenience variables")
26112f7f4726 ("btrfs: take an fs_info parameter directly when the root is not used otherwise")
from the btrfs-kdave tree and commit:
81a75f6781de ("btrfs: use bio fields for op and flags")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/btrfs/disk-io.c
index 9d778665c9eb,e80ef6eb17e6..000000000000
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@@ -926,7 -921,7 +922,7 @@@ static int __btree_submit_bio_done(stru
* when we're called for a write, we're already in the async
* submission context. Just jump into btrfs_map_bio
*/
- ret = btrfs_map_bio(btrfs_sb(inode->i_sb), rw, bio, mirror_num, 1);
- ret = btrfs_map_bio(BTRFS_I(inode)->root, bio, mirror_num, 1);
++ ret = btrfs_map_bio(btrfs_sb(inode->i_sb), bio, mirror_num, 1);
if (ret) {
bio->bi_error = ret;
bio_endio(bio);
@@@ -958,23 -952,24 +954,23 @@@ static int btree_submit_bio_hook(struc
* called for a read, do the setup so that checksum validation
* can happen in the async kernel threads
*/
- ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info,
- bio, BTRFS_WQ_ENDIO_METADATA);
+ ret = btrfs_bio_wq_end_io(fs_info, bio,
+ BTRFS_WQ_ENDIO_METADATA);
if (ret)
goto out_w_error;
- ret = btrfs_map_bio(fs_info, rw, bio, mirror_num, 0);
- ret = btrfs_map_bio(BTRFS_I(inode)->root, bio, mirror_num, 0);
++ ret = btrfs_map_bio(fs_info, bio, mirror_num, 0);
} else if (!async) {
ret = btree_csum_one_bio(bio);
if (ret)
goto out_w_error;
- ret = btrfs_map_bio(fs_info, rw, bio, mirror_num, 0);
- ret = btrfs_map_bio(BTRFS_I(inode)->root, bio, mirror_num, 0);
++ ret = btrfs_map_bio(fs_info, bio, mirror_num, 0);
} else {
/*
* kthread helpers are used to submit writes so that
* checksumming can happen in parallel across all CPUs
*/
- ret = btrfs_wq_submit_bio(fs_info, inode, rw, bio,
- ret = btrfs_wq_submit_bio(BTRFS_I(inode)->root->fs_info,
- inode, bio, mirror_num, 0,
- bio_offset,
++ ret = btrfs_wq_submit_bio(fs_info, inode, bio,
+ mirror_num, 0, bio_offset,
__btree_submit_bio_start,
__btree_submit_bio_done);
}
next reply other threads:[~2016-07-08 3:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-08 3:27 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-02-18 1:07 linux-next: manual merge of the block tree with the btrfs-kdave tree Stephen Rothwell
2017-06-21 3:13 Stephen Rothwell
2017-06-20 1:37 Stephen Rothwell
2017-06-13 3:50 Stephen Rothwell
2017-06-13 3:34 Stephen Rothwell
2017-06-13 3:27 Stephen Rothwell
2017-06-13 3:15 Stephen Rothwell
2016-11-17 2:01 Stephen Rothwell
2016-11-17 2:49 ` Jens Axboe
2016-11-17 13:23 ` Christoph Hellwig
2016-11-18 17:47 ` David Sterba
2016-07-08 4:03 Stephen Rothwell
2016-07-08 4:00 Stephen Rothwell
2016-07-08 3:49 Stephen Rothwell
2016-07-08 3:31 Stephen Rothwell
2016-07-08 3:26 Stephen Rothwell
2016-06-24 2:34 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160708132736.2509cbea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=dsterba@suse$(echo .)cz \
--cc=jeffm@suse$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox