public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
	Eric Biggers <ebiggers@kernel•org>,
	"Theodore Y. Ts'o" <tytso@mit•edu>
Cc: Eric Biggers <ebiggers@google•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	"Matthew Wilcox (Oracle)" <willy@infradead•org>
Subject: linux-next: manual merge of the mm tree with the fsverity tree
Date: Tue, 10 Jan 2023 13:25:19 +1100	[thread overview]
Message-ID: <20230110132519.72181341@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1994 bytes --]

Hi all,

Today's linux-next merge of the mm tree got a conflict in:

  fs/buffer.c

between commit:

  2a042de143b2 ("fs/buffer.c: support fsverity in block_read_full_folio()")

from the fsverity tree and commit:

  a0ab20df28e6 ("buffer: replace obvious uses of b_page with b_folio")

from the mm 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/buffer.c
index 2e65ba2b3919,7e42d67bcaad..000000000000
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@@ -352,24 -319,15 +352,24 @@@ static void decrypt_bh(struct work_stru
   */
  static void end_buffer_async_read_io(struct buffer_head *bh, int uptodate)
  {
- 	struct inode *inode = bh->b_page->mapping->host;
 -	/* Decrypt if needed */
 -	if (uptodate &&
 -	    fscrypt_inode_uses_fs_layer_crypto(bh->b_folio->mapping->host)) {
 -		struct decrypt_bh_ctx *ctx = kmalloc(sizeof(*ctx), GFP_ATOMIC);
++	struct inode *inode = bh->b_folio->mapping->host;
 +	bool decrypt = fscrypt_inode_uses_fs_layer_crypto(inode);
 +	bool verify = need_fsverity(bh);
 +
 +	/* Decrypt (with fscrypt) and/or verify (with fsverity) if needed. */
 +	if (uptodate && (decrypt || verify)) {
 +		struct postprocess_bh_ctx *ctx =
 +			kmalloc(sizeof(*ctx), GFP_ATOMIC);
  
  		if (ctx) {
 -			INIT_WORK(&ctx->work, decrypt_bh);
  			ctx->bh = bh;
 -			fscrypt_enqueue_decrypt_work(&ctx->work);
 +			if (decrypt) {
 +				INIT_WORK(&ctx->work, decrypt_bh);
 +				fscrypt_enqueue_decrypt_work(&ctx->work);
 +			} else {
 +				INIT_WORK(&ctx->work, verify_bh);
 +				fsverity_enqueue_verify_work(&ctx->work);
 +			}
  			return;
  		}
  		uptodate = 0;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2023-01-10  2:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-10  2:25 Stephen Rothwell [this message]
2023-01-19  5:02 ` linux-next: manual merge of the mm tree with the fsverity tree 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=20230110132519.72181341@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=ebiggers@google$(echo .)com \
    --cc=ebiggers@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=tytso@mit$(echo .)edu \
    --cc=willy@infradead$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox