linux-next: manual merge of the block tree with the vfs-brauner, vfs trees

[Stephen Rothwell]

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 requests")
  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.

-- 
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;
  
 -		/* 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;
  
  		kiocb->ki_flags |= IOCB_NOWAIT;
  	} else {
@@@ -1055,9 -1028,9 +1029,9 @@@
  	kiocb->ki_flags |= IOCB_WRITE;
  
  	if (likely(req->file->f_op->write_iter))
- 		ret2 = req->file->f_op->write_iter(kiocb, &s->iter);
 -		ret2 = call_write_iter(req->file, kiocb, &io->iter);
++		ret2 = req->file->f_op->write_iter(kiocb, &io->iter);
  	else if (req->file->f_op->write)
- 		ret2 = loop_rw_iter(WRITE, rw, &s->iter);
+ 		ret2 = loop_rw_iter(WRITE, rw, &io->iter);
  	else
  		ret2 = -EINVAL;

Attachment: pgp73I6zUevy_.pgp
Description: OpenPGP digital signature