From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 May 2024 20:11:44 +0000 (-0700)
Subject: Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b6394d6f715919c053c1450ef0d7c5e517b53764;p=linux.git

Merge tag 'pull-misc' of git://git./linux/kernel/git/viro/vfs

Pull misc vfs updates from Al Viro:
 "Assorted commits that had missed the last merge window..."

* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  remove call_{read,write}_iter() functions
  do_dentry_open(): kill inode argument
  kernel_file_open(): get rid of inode argument
  get_file_rcu(): no need to check for NULL separately
  fd_is_open(): move to fs/file.c
  close_on_exec(): pass files_struct instead of fdtable
---

b6394d6f715919c053c1450ef0d7c5e517b53764
diff --cc io_uring/rw.c
index 894c43a5fc0e5,7d335b7e00ed3..1a2128459cb4c
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@@ -1046,9 -1047,9 +1046,9 @@@ int io_write(struct io_kiocb *req, unsi
  	kiocb->ki_flags |= IOCB_WRITE;
  
  	if (likely(req->file->f_op->write_iter))
- 		ret2 = call_write_iter(req->file, kiocb, &io->iter);
 -		ret2 = req->file->f_op->write_iter(kiocb, &s->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;