Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb05f41f authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: cleanup fuse_direct_io() 



Fix the following sparse warnings:

fs/fuse/file.c:1216:43: warning: cast removes address space of expression
fs/fuse/file.c:1216:43: warning: incorrect type in initializer (different address spaces)
fs/fuse/file.c:1216:43:    expected void [noderef] <asn:1>*iov_base
fs/fuse/file.c:1216:43:    got void *<noident>
fs/fuse/file.c:1241:43: warning: cast removes address space of expression
fs/fuse/file.c:1241:43: warning: incorrect type in initializer (different address spaces)
fs/fuse/file.c:1241:43:    expected void [noderef] <asn:1>*iov_base
fs/fuse/file.c:1241:43:    got void *<noident>
fs/fuse/file.c:1267:43: warning: cast removes address space of expression
fs/fuse/file.c:1267:43: warning: incorrect type in initializer (different address spaces)
fs/fuse/file.c:1267:43:    expected void [noderef] <asn:1>*iov_base
fs/fuse/file.c:1267:43:    got void *<noident>

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent 5565a9d8

fs/fuse/cuse.c

+5 −2
Original line number Diff line number Diff line
@@ -91,19 +91,22 @@ static ssize_t cuse_read(struct file *file, char __user *buf, size_t count, 
			 loff_t *ppos)

{

	loff_t pos = 0;

	struct iovec iov = { .iov_base = buf, .iov_len = count };



	return fuse_direct_io(file, buf, count, &pos, 0);

	return fuse_direct_io(file, &iov, 1, count, &pos, 0);

}



static ssize_t cuse_write(struct file *file, const char __user *buf,

			  size_t count, loff_t *ppos)

{

	loff_t pos = 0;

	struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };



	/*

	 * No locking or generic_write_checks(), the server is

	 * responsible for locking and sanity checks.

	 */

	return fuse_direct_io(file, buf, count, &pos, 1);

	return fuse_direct_io(file, &iov, 1, count, &pos, 1);

}



static int cuse_open(struct inode *inode, struct file *file)

fs/fuse/file.c

+8 −15
Original line number Diff line number Diff line
@@ -1148,9 +1148,9 @@ static inline int fuse_iter_npages(const struct iov_iter *ii_p) 
	return min(npages, FUSE_MAX_PAGES_PER_REQ);

}



static ssize_t __fuse_direct_io(struct file *file, const struct iovec *iov,

				unsigned long nr_segs, size_t count,

				loff_t *ppos, int write)

ssize_t fuse_direct_io(struct file *file, const struct iovec *iov,

		       unsigned long nr_segs, size_t count, loff_t *ppos,

		       int write)

{

	struct fuse_file *ff = file->private_data;

	struct fuse_conn *fc = ff->fc;
@@ -1209,13 +1209,6 @@ static ssize_t __fuse_direct_io(struct file *file, const struct iovec *iov, 


	return res;

}



ssize_t fuse_direct_io(struct file *file, const char __user *buf,

		       size_t count, loff_t *ppos, int write)

{

	struct iovec iov = { .iov_base = (void *)buf, .iov_len = count };

	return __fuse_direct_io(file, &iov, 1, count, ppos, write);

}

EXPORT_SYMBOL_GPL(fuse_direct_io);



static ssize_t __fuse_direct_read(struct file *file, const struct iovec *iov,
@@ -1227,7 +1220,7 @@ static ssize_t __fuse_direct_read(struct file *file, const struct iovec *iov, 
	if (is_bad_inode(inode))

		return -EIO;



	res = __fuse_direct_io(file, iov, nr_segs, iov_length(iov, nr_segs),

	res = fuse_direct_io(file, iov, nr_segs, iov_length(iov, nr_segs),

			     ppos, 0);



	fuse_invalidate_attr(inode);
@@ -1238,7 +1231,7 @@ static ssize_t __fuse_direct_read(struct file *file, const struct iovec *iov, 
static ssize_t fuse_direct_read(struct file *file, char __user *buf,

				     size_t count, loff_t *ppos)

{

	struct iovec iov = { .iov_base = (void *)buf, .iov_len = count };

	struct iovec iov = { .iov_base = buf, .iov_len = count };

	return __fuse_direct_read(file, &iov, 1, ppos);

}
@@ -1251,7 +1244,7 @@ static ssize_t __fuse_direct_write(struct file *file, const struct iovec *iov, 


	res = generic_write_checks(file, ppos, &count, 0);

	if (!res) {

		res = __fuse_direct_io(file, iov, nr_segs, count, ppos, 1);

		res = fuse_direct_io(file, iov, nr_segs, count, ppos, 1);

		if (res > 0)

			fuse_write_update_size(inode, *ppos);

	}
@@ -1264,7 +1257,7 @@ static ssize_t __fuse_direct_write(struct file *file, const struct iovec *iov, 
static ssize_t fuse_direct_write(struct file *file, const char __user *buf,

				 size_t count, loff_t *ppos)

{

	struct iovec iov = { .iov_base = (void *)buf, .iov_len = count };

	struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };

	struct inode *inode = file->f_path.dentry->d_inode;

	ssize_t res;

fs/fuse/fuse_i.h

+3 −2
Original line number Diff line number Diff line
@@ -811,8 +811,9 @@ int fuse_reverse_inval_entry(struct super_block *sb, u64 parent_nodeid, 


int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file,

		 bool isdir);

ssize_t fuse_direct_io(struct file *file, const char __user *buf,

		       size_t count, loff_t *ppos, int write);

ssize_t fuse_direct_io(struct file *file, const struct iovec *iov,

		       unsigned long nr_segs, size_t count, loff_t *ppos,

		       int write);

long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,

		   unsigned int flags);

long fuse_ioctl_common(struct file *file, unsigned int cmd,