Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 27 Jan 2021 22:39:18 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        David Sterba <dsterba@suse.cz>
Cc:     Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Martin Raiber <martin@urbackup.org>,
        "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: linux-next: manual merge of the akpm-current tree with the btrfs
 tree
Message-ID: <20210127223918.1b3e4b3f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/l9gz.s2npSG+SyuDen2A6Rb";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/l9gz.s2npSG+SyuDen2A6Rb
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/btrfs/file.c

between commit:

  0225a20db6d8 ("btrfs: Prevent nowait or async read from doing sync IO")

from the btrfs tree and commit:

  ddcd14c48a30 ("mm/filemap: rename generic_file_buffered_read to filemap_r=
ead")

from the akpm-current 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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/btrfs/file.c
index 5282f456c99c,898ef7b792b7..000000000000
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@@ -3629,18 -3639,7 +3629,18 @@@ static ssize_t btrfs_file_read_iter(str
  			return ret;
  	}
 =20
 -	return filemap_read(iocb, to, ret);
 +	if (iocb->ki_flags & IOCB_NOWAIT)
 +		iocb->ki_flags |=3D IOCB_NOIO;
 +
- 	ret =3D generic_file_buffered_read(iocb, to, ret);
++	ret =3D filemap_read(iocb, to, ret);
 +
 +	if (iocb->ki_flags & IOCB_NOWAIT) {
 +		iocb->ki_flags &=3D ~IOCB_NOIO;
 +		if (ret =3D=3D 0)
 +			ret =3D -EAGAIN;
 +	}
 +
 +	return ret;
  }
 =20
  const struct file_operations btrfs_file_operations =3D {

--Sig_/l9gz.s2npSG+SyuDen2A6Rb
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmARUOYACgkQAVBC80lX
0GwUTAf+KYmKcJ8DMkClAUpERqkIEdEgysnQi1Yis3T5VgZiypDCG76zlUY68+qe
PVmIHO47y7KNTgbdkTxcGLYpaESVAA/IH9Chxj+ZugO12yYCoe6JwEel2cyVFhws
xvqsYiNeExbpsSt785JOyt/B2P+sv8JqY8Wy3HilRXrRsMD5D9dTeZS5duQm1Xkl
XQ8eONAAIKRRDbqENPI2qtpEwnknXk6YxU5d/gEecHdDPUUhxpduATeiK91ifjeF
QeG5xCwHxRQJ84yFUcDr5cu+ooZ+hxoALbEEhhYJFbThsDlIVTX7uphbFILkE3k+
V0pNaDGGdb139GZnoQ0OAUn9bRv3+A==
=MJE4
-----END PGP SIGNATURE-----

--Sig_/l9gz.s2npSG+SyuDen2A6Rb--