]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 May 2024 20:11:44 +0000 (13:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 May 2024 20:11:44 +0000 (13:11 -0700)
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

1  2 
fs/aio.c
fs/proc/fd.c
fs/read_write.c
include/linux/fs.h
io_uring/rw.c

diff --cc fs/aio.c
Simple merge
diff --cc fs/proc/fd.c
Simple merge
diff --cc fs/read_write.c
Simple merge
Simple merge
diff --cc io_uring/rw.c
index 894c43a5fc0e5d7b0db09fc40f473c8b406c4ff9,7d335b7e00ed389b6bd24eab1d66e99aa4a2150b..1a2128459cb4c82ea556cf7e4ae3a244365d172b
@@@ -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;