Commit a6294593 authored Aug 02, 2021 by Andreas Gruenbacher

iov_iter: Turn iov_iter_fault_in_readable into fault_in_iov_iter_readable

Turn iov_iter_fault_in_readable into a function that returns the number
of bytes not faulted in, similar to copy_to_user, instead of returning a
non-zero value when any of the requested pages couldn't be faulted in.
This supports the existing users that require all pages to be faulted in
as well as new users that are happy if any pages can be faulted in.

Rename iov_iter_fault_in_readable to fault_in_iov_iter_readable to make
sure this change doesn't silently break things.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

parent bb523b40

fs/btrfs/file.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1710,7 +1710,7 @@ static noinline ssize_t btrfs_buffered_write(struct kiocb *iocb,
	* Fault pages before locking them in prepare_pages		* Fault pages before locking them in prepare_pages
	* to avoid recursive lock		* to avoid recursive lock
	*/		*/
	if (unlikely(iov_iter_fault_in_readable(i, write_bytes))) {		if (unlikely(fault_in_iov_iter_readable(i, write_bytes))) {
	ret = -EFAULT;		ret = -EFAULT;
	break;		break;
	}		}

fs/f2fs/file.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4276,7 +4276,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb iocb, struct iov_iter from)
	size_t target_size = 0;		size_t target_size = 0;
	int err;		int err;

	if (iov_iter_fault_in_readable(from, iov_iter_count(from)))		if (fault_in_iov_iter_readable(from, iov_iter_count(from)))
	set_inode_flag(inode, FI_NO_PREALLOC);		set_inode_flag(inode, FI_NO_PREALLOC);

	if ((iocb->ki_flags & IOCB_NOWAIT)) {		if ((iocb->ki_flags & IOCB_NOWAIT)) {

fs/fuse/file.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1164,7 +1164,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia,

	again:		again:
	err = -EFAULT;		err = -EFAULT;
	if (iov_iter_fault_in_readable(ii, bytes))		if (fault_in_iov_iter_readable(ii, bytes))
	break;		break;

	err = -ENOMEM;		err = -ENOMEM;

fs/iomap/buffered-io.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -750,7 +750,7 @@ static loff_t iomap_write_iter(struct iomap_iter iter, struct iov_iter i)
	* same page as we're writing to, without it being marked		* same page as we're writing to, without it being marked
	* up-to-date.		* up-to-date.
	*/		*/
	if (unlikely(iov_iter_fault_in_readable(i, bytes))) {		if (unlikely(fault_in_iov_iter_readable(i, bytes))) {
	status = -EFAULT;		status = -EFAULT;
	break;		break;
	}		}

fs/ntfs/file.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1829,7 +1829,7 @@ static ssize_t ntfs_perform_write(struct file file, struct iov_iter i,
	* pages being swapped out between us bringing them into memory		* pages being swapped out between us bringing them into memory
	* and doing the actual copying.		* and doing the actual copying.
	*/		*/
	if (unlikely(iov_iter_fault_in_readable(i, bytes))) {		if (unlikely(fault_in_iov_iter_readable(i, bytes))) {
	status = -EFAULT;		status = -EFAULT;
	break;		break;
	}		}