Received-SPF: pass (google.com: domain of linux-kernel+bounces-146129-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Tue, 16 Apr 2024 12:44:26 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Christian Brauner <brauner@kernel.org>, Al
 Viro <viro@ZenIV.linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Miklos Szeredi
 <mszeredi@redhat.com>
Subject: linux-next: manual merge of the block tree with the vfs-brauner,
 vfs trees
Message-ID: <20240416124426.624cfaf9@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/m8f_evjuhWhg6A1r=yhb4Q6";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/m8f_evjuhWhg6A1r=yhb4Q6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  io_uring/rw.c

between commits:

  210a03c9d51a ("fs: claw back a few FMODE_* bits")
  7c98f7cb8fda ("remove call_{read,write}_iter() functions")

from the vfs-brauner, vfs trees and commits:

  a9165b83c193 ("io_uring/rw: always setup io_async_rw for read/write reque=
sts")
  0d10bd77a1be ("io_uring: get rid of struct io_rw_state")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc io_uring/rw.c
index d517a1a29274,3134a6ece1be..000000000000
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@@ -1028,13 -1003,13 +1004,13 @@@ int io_write(struct io_kiocb *req, unsi
  	if (force_nonblock) {
  		/* If the file doesn't support async, just async punt */
  		if (unlikely(!io_file_supports_nowait(req)))
- 			goto copy_iov;
+ 			goto ret_eagain;
 =20
 -		/* File path supports NOWAIT for non-direct_IO only for block devices. =
*/
 +		/* Check if we can support NOWAIT. */
  		if (!(kiocb->ki_flags & IOCB_DIRECT) &&
 -			!(kiocb->ki_filp->f_mode & FMODE_BUF_WASYNC) &&
 -			(req->flags & REQ_F_ISREG))
 +		    !(req->file->f_op->fop_flags & FOP_BUFFER_WASYNC) &&
 +		    (req->flags & REQ_F_ISREG))
- 			goto copy_iov;
+ 			goto ret_eagain;
 =20
  		kiocb->ki_flags |=3D IOCB_NOWAIT;
  	} else {
@@@ -1055,9 -1028,9 +1029,9 @@@
  	kiocb->ki_flags |=3D IOCB_WRITE;
 =20
  	if (likely(req->file->f_op->write_iter))
- 		ret2 =3D req->file->f_op->write_iter(kiocb, &s->iter);
 -		ret2 =3D call_write_iter(req->file, kiocb, &io->iter);
++		ret2 =3D req->file->f_op->write_iter(kiocb, &io->iter);
  	else if (req->file->f_op->write)
- 		ret2 =3D loop_rw_iter(WRITE, rw, &s->iter);
+ 		ret2 =3D loop_rw_iter(WRITE, rw, &io->iter);
  	else
  		ret2 =3D -EINVAL;
 =20

--Sig_/m8f_evjuhWhg6A1r=yhb4Q6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYd5goACgkQAVBC80lX
0Gzdhgf7B/64lJSehzi2t9+TjMayIbnv5trux8hxlGjDICXLRDhuBAE9nCQwddTB
z9osMIAVuYl4D/+4ocJYWPEX7nyhGL1gMP7Gam1fW7XZhdm27veSH2XGkt2NRhVh
BkaGdK5QY+nQsWsyl4+U9ZpbFWFk9EiWaUkRGdakRmclBB7g3K+nWvyPg6BVlGSw
/17/5hO8FGVk6cisBAvqzfvebUNBW+JCuBU1bTilxtC4efcYO/nYd2hBRuraK8ME
lRVcncKv4IRXKcHg2miblzpUqFHxyivAzqguS3GkwjB8W3VMde2TrDSvnrjqn3zP
GcExA4J4DWwz/Wl995OCQhrjudhGSg==
=2tLZ
-----END PGP SIGNATURE-----

--Sig_/m8f_evjuhWhg6A1r=yhb4Q6--