Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (805c6d3c) · Commits · 戴 / test

fs/fuse/file.c

+12 −13

Original line number	Diff line number	Diff line
		@@ -3091,11 +3091,10 @@ fuse_direct_IO(struct kiocb iocb, struct iov_iter iter)
		ssize_t ret = 0;
		struct file *file = iocb->ki_filp;
		struct fuse_file *ff = file->private_data;
		bool async_dio = ff->fc->async_dio;
		loff_t pos = 0;
		struct inode *inode;
		loff_t i_size;
		size_t count = iov_iter_count(iter);
		size_t count = iov_iter_count(iter), shortened = 0;
		loff_t offset = iocb->ki_pos;
		struct fuse_io_priv *io;

		@@ -3103,17 +3102,9 @@ fuse_direct_IO(struct kiocb iocb, struct iov_iter iter)
		inode = file->f_mapping->host;
		i_size = i_size_read(inode);

		if ((iov_iter_rw(iter) == READ) && (offset > i_size))
		if ((iov_iter_rw(iter) == READ) && (offset >= i_size))
		return 0;

		/* optimization for short read */
		if (async_dio && iov_iter_rw(iter) != WRITE && offset + count > i_size) {
		if (offset >= i_size)
		return 0;
		iov_iter_truncate(iter, fuse_round_up(ff->fc, i_size - offset));
		count = iov_iter_count(iter);
		}

		io = kmalloc(sizeof(struct fuse_io_priv), GFP_KERNEL);
		if (!io)
		return -ENOMEM;
		@@ -3129,15 +3120,22 @@ fuse_direct_IO(struct kiocb iocb, struct iov_iter iter)
		* By default, we want to optimize all I/Os with async request
		* submission to the client filesystem if supported.
		*/
		io->async = async_dio;
		io->async = ff->fc->async_dio;
		io->iocb = iocb;
		io->blocking = is_sync_kiocb(iocb);

		/* optimization for short read */
		if (io->async && !io->write && offset + count > i_size) {
		iov_iter_truncate(iter, fuse_round_up(ff->fc, i_size - offset));
		shortened = count - iov_iter_count(iter);
		count -= shortened;
		}

		/*
		* We cannot asynchronously extend the size of a file.
		* In such case the aio will behave exactly like sync io.
		*/
		if ((offset + count > i_size) && iov_iter_rw(iter) == WRITE)
		if ((offset + count > i_size) && io->write)
		io->blocking = true;

		if (io->async && io->blocking) {
		@@ -3155,6 +3153,7 @@ fuse_direct_IO(struct kiocb iocb, struct iov_iter iter)
		} else {
		ret = __fuse_direct_read(io, iter, &pos);
		}
		iov_iter_reexpand(iter, iov_iter_count(iter) + shortened);

		if (io->async) {
		bool blocking = io->blocking;

fs/vboxsf/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ fail_nomem:

		static int vboxsf_parse_monolithic(struct fs_context fc, void data)
		{
		char *options = data;
		unsigned char *options = data;

		if (options && options[0] == VBSF_MOUNT_SIGNATURE_BYTE_0 &&
		options[1] == VBSF_MOUNT_SIGNATURE_BYTE_1 &&

include/linux/fs_parser.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ static inline bool fs_validate_description(const char *name,
		#define fsparam_u32oct(NAME, OPT) \
		__fsparam(fs_param_is_u32, NAME, OPT, 0, (void *)8)
		#define fsparam_u32hex(NAME, OPT) \
		__fsparam(fs_param_is_u32_hex, NAME, OPT, 0, (void *16))
		__fsparam(fs_param_is_u32_hex, NAME, OPT, 0, (void *)16)
		#define fsparam_s32(NAME, OPT) __fsparam(fs_param_is_s32, NAME, OPT, 0, NULL)
		#define fsparam_u64(NAME, OPT) __fsparam(fs_param_is_u64, NAME, OPT, 0, NULL)
		#define fsparam_enum(NAME, OPT, array) __fsparam(fs_param_is_enum, NAME, OPT, 0, array)

Admin message