From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Chris Mason <clm@fb•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kent Overstreet <kent.overstreet@gmail•com>
Subject: linux-next: manual merge of the block tree with the btrfs tree
Date: Mon, 24 Aug 2015 14:16:07 +1000 [thread overview]
Message-ID: <20150824141607.5644d08c@canb.auug.org.au> (raw)
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/inode.c
between commit:
da2f0f74cf7d ("Btrfs: add support for blkio controllers")
from the btrfs tree and commit:
b54ffb73cadc ("block: remove bio_get_nr_vecs()")
from the block tree.
I fixed it up (following Chris's example merge - see below) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/btrfs/inode.c
index bda3c41dc9d5,f924d9a62700..000000000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -7986,12 -7958,7 +7987,11 @@@ out
static struct bio *btrfs_dio_bio_alloc(struct block_device *bdev,
u64 first_sector, gfp_t gfp_flags)
{
- int nr_vecs = bio_get_nr_vecs(bdev);
- return btrfs_bio_alloc(bdev, first_sector, BIO_MAX_PAGES, gfp_flags);
+ struct bio *bio;
- bio = btrfs_bio_alloc(bdev, first_sector, nr_vecs, gfp_flags);
++ bio = btrfs_bio_alloc(bdev, first_sector, BIO_MAX_PAGES, gfp_flags);
+ if (bio)
+ bio_associate_current(bio);
+ return bio;
}
static inline int btrfs_lookup_and_bind_dio_csum(struct btrfs_root *root,
next reply other threads:[~2015-08-24 4:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 4:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 2:45 linux-next: manual merge of the block tree with the btrfs tree Stephen Rothwell
2023-12-21 5:23 ` Christoph Hellwig
2022-07-15 3:25 Stephen Rothwell
2021-02-02 2:45 Stephen Rothwell
2021-02-14 22:17 ` Stephen Rothwell
2020-12-07 2:44 Stephen Rothwell
2020-07-09 2:58 Stephen Rothwell
2016-06-14 2:44 Stephen Rothwell
2015-08-24 4:16 Stephen Rothwell
2015-08-24 4:15 Stephen Rothwell
2015-08-24 4:15 Stephen Rothwell
2014-01-09 4:01 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=20150824141607.5644d08c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=clm@fb$(echo .)com \
--cc=kent.overstreet@gmail$(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