Commit 92f90cc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fixes from Miklos Szeredi:

 - Fix an issue with splice on the fuse device

 - Fix a regression in the fileattr API conversion

 - Add a small userspace API improvement

* tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix pipe buffer lifetime for direct_io
  fuse: move FUSE_SUPER_MAGIC definition to magic.h
  fuse: fix fileattr op failure
parents cd22a8bf 0c4bcfde

fs/fuse/dev.c

+11 −1
Original line number Diff line number Diff line
@@ -941,7 +941,17 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep, 


	while (count) {

		if (cs->write && cs->pipebufs && page) {

			/*

			 * Can't control lifetime of pipe buffers, so always

			 * copy user pages.

			 */

			if (cs->req->args->user_pages) {

				err = fuse_copy_fill(cs);

				if (err)

					return err;

			} else {

				return fuse_ref_page(cs, page, offset, count);

			}

		} else if (!cs->len) {

			if (cs->move_pages && page &&

			    offset == 0 && count == PAGE_SIZE) {

fs/fuse/file.c

+1 −0
Original line number Diff line number Diff line
@@ -1413,6 +1413,7 @@ static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii, 
			(PAGE_SIZE - ret) & (PAGE_SIZE - 1);

	}



	ap->args.user_pages = true;

	if (write)

		ap->args.in_pages = true;

	else

fs/fuse/fuse_i.h

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ struct fuse_args { 
	bool nocreds:1;

	bool in_pages:1;

	bool out_pages:1;

	bool user_pages:1;

	bool out_argvar:1;

	bool page_zeroing:1;

	bool page_replace:1;

fs/fuse/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/exportfs.h>

#include <linux/posix_acl.h>

#include <linux/pid_namespace.h>

#include <uapi/linux/magic.h>



MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");

MODULE_DESCRIPTION("Filesystem in Userspace");
@@ -50,8 +51,6 @@ MODULE_PARM_DESC(max_user_congthresh, 
 "Global limit for the maximum congestion threshold an "

 "unprivileged user can set");



#define FUSE_SUPER_MAGIC 0x65735546



#define FUSE_DEFAULT_BLKSIZE 512



/** Maximum number of outstanding background requests */

fs/fuse/ioctl.c

+6 −3
Original line number Diff line number Diff line
@@ -394,9 +394,12 @@ static int fuse_priv_ioctl(struct inode *inode, struct fuse_file *ff, 
	args.out_args[1].value = ptr;



	err = fuse_simple_request(fm, &args);

	if (!err && outarg.flags & FUSE_IOCTL_RETRY)

	if (!err) {

		if (outarg.result < 0)

			err = outarg.result;

		else if (outarg.flags & FUSE_IOCTL_RETRY)

			err = -EIO;



	}

	return err;

}