From: broonie@kernel.org
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>,
Eric Biggers <ebiggers@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Satya Tangirala <satyat@google.com>
Subject: linux-next: manual merge of the block tree with the fscrypt tree
Date: Mon, 21 Feb 2022 16:47:13 +0000 [thread overview]
Message-ID: <20220221164713.2475459-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/iomap/direct-io.c
between commit:
489734ef94f4f ("iomap: support direct I/O with fscrypt using blk-crypto")
from the fscrypt tree and commit:
07888c665b405 ("block: pass a block_device and opf to bio_alloc")
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.
diff --cc fs/iomap/direct-io.c
index 20325b3926fa3,e2ba13645ef28..0000000000000
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@@ -185,10 -183,7 +185,9 @@@ static void iomap_dio_zero(const struc
int flags = REQ_SYNC | REQ_IDLE;
struct bio *bio;
- bio = bio_alloc(GFP_KERNEL, 1);
+ bio = bio_alloc(iter->iomap.bdev, 1, REQ_OP_WRITE | flags, GFP_KERNEL);
+ fscrypt_set_bio_crypt_ctx(bio, inode, pos >> inode->i_blkbits,
+ GFP_KERNEL);
- bio_set_dev(bio, iter->iomap.bdev);
bio->bi_iter.bi_sector = iomap_sector(&iter->iomap, pos);
bio->bi_private = dio;
bio->bi_end_io = iomap_dio_bio_end_io;
@@@ -313,10 -307,7 +311,9 @@@ static loff_t iomap_dio_bio_iter(const
goto out;
}
- bio = bio_alloc(GFP_KERNEL, nr_pages);
+ bio = bio_alloc(iomap->bdev, nr_pages, bio_opf, GFP_KERNEL);
+ fscrypt_set_bio_crypt_ctx(bio, inode, pos >> inode->i_blkbits,
+ GFP_KERNEL);
- bio_set_dev(bio, iomap->bdev);
bio->bi_iter.bi_sector = iomap_sector(iomap, pos);
bio->bi_write_hint = dio->iocb->ki_hint;
bio->bi_ioprio = dio->iocb->ki_ioprio;
next reply other threads:[~2022-02-21 16:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 16:47 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 16:45 linux-next: manual merge of the block tree with the fscrypt tree broonie
2022-02-14 1:11 Stephen Rothwell
2022-02-14 7:15 ` Christoph Hellwig
2022-02-14 19:26 ` Eric Biggers
2020-07-09 3:02 Stephen Rothwell
2020-07-23 1:03 ` Stephen Rothwell
2019-01-16 2:25 Stephen Rothwell
2019-01-16 2:55 ` Jens Axboe
2019-01-16 3:13 ` Ming Lei
2019-01-16 3:17 ` Jens Axboe
2019-01-16 7:39 ` Ming Lei
2019-01-16 14:27 ` Jens Axboe
2019-01-18 2:45 ` Ming Lei
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=20220221164713.2475459-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=axboe@kernel.dk \
--cc=ebiggers@google.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=satyat@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).