Commit 0c679382 authored by Alexander Mikhalitsyn's avatar Alexander Mikhalitsyn Committed by Miklos Szeredi
Browse files

fs/fuse: introduce and use fuse_simple_idmap_request() helper 



Let's convert all existing callers properly.

No functional changes intended.

Suggested-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAlexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 3988a60d

fs/fuse/dax.c

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int fuse_setup_one_mapping(struct inode *inode, unsigned long start_idx, 
	args.in_numargs = 1;

	args.in_args[0].size = sizeof(inarg);

	args.in_args[0].value = &inarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err < 0)

		return err;

	dmap->writable = writable;
@@ -245,7 +245,7 @@ static int fuse_send_removemapping(struct inode *inode, 
	args.in_args[0].value = inargp;

	args.in_args[1].size = inargp->count * sizeof(*remove_one);

	args.in_args[1].value = remove_one;

	return fuse_simple_request(NULL, fm, &args);

	return fuse_simple_request(fm, &args);

}



static int dmap_removemapping_list(struct inode *inode, unsigned int num,

fs/fuse/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args) 
		__set_bit(FR_ASYNC, &req->flags);

}



ssize_t fuse_simple_request(struct mnt_idmap *idmap,

ssize_t __fuse_simple_request(struct mnt_idmap *idmap,

			      struct fuse_mount *fm,

			      struct fuse_args *args)

{

fs/fuse/dir.c

+13 −13
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) 
		parent = dget_parent(entry);

		fuse_lookup_init(fm->fc, &args, get_node_id(d_inode(parent)),

				 &entry->d_name, &outarg);

		ret = fuse_simple_request(NULL, fm, &args);

		ret = fuse_simple_request(fm, &args);

		dput(parent);

		/* Zero nodeid is same as -ENOENT */

		if (!ret && !outarg.nodeid)
@@ -383,7 +383,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name 
	attr_version = fuse_get_attr_version(fm->fc);



	fuse_lookup_init(fm->fc, &args, nodeid, name, outarg);

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	/* Zero nodeid is same as -ENOENT, but with valid timeout */

	if (err || !outarg->nodeid)

		goto out_put_forget;
@@ -677,7 +677,7 @@ static int fuse_create_open(struct mnt_idmap *idmap, struct inode *dir, 
	if (err)

		goto out_free_ff;



	err = fuse_simple_request(idmap, fm, &args);

	err = fuse_simple_idmap_request(idmap, fm, &args);

	free_ext_value(&args);

	if (err)

		goto out_free_ff;
@@ -809,7 +809,7 @@ static int create_new_entry(struct mnt_idmap *idmap, struct fuse_mount *fm, 
			goto out_put_forget_req;

	}



	err = fuse_simple_request(idmap, fm, args);

	err = fuse_simple_idmap_request(idmap, fm, args);

	free_ext_value(args);

	if (err)

		goto out_put_forget_req;
@@ -994,7 +994,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry) 
	args.in_numargs = 1;

	args.in_args[0].size = entry->d_name.len + 1;

	args.in_args[0].value = entry->d_name.name;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (!err) {

		fuse_dir_changed(dir);

		fuse_entry_unlinked(entry);
@@ -1017,7 +1017,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry) 
	args.in_numargs = 1;

	args.in_args[0].size = entry->d_name.len + 1;

	args.in_args[0].value = entry->d_name.name;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (!err) {

		fuse_dir_changed(dir);

		fuse_entry_unlinked(entry);
@@ -1047,7 +1047,7 @@ static int fuse_rename_common(struct mnt_idmap *idmap, struct inode *olddir, str 
	args.in_args[1].value = oldent->d_name.name;

	args.in_args[2].size = newent->d_name.len + 1;

	args.in_args[2].value = newent->d_name.name;

	err = fuse_simple_request(idmap, fm, &args);

	err = fuse_simple_idmap_request(idmap, fm, &args);

	if (!err) {

		/* ctime changes */

		fuse_update_ctime(d_inode(oldent));
@@ -1222,7 +1222,7 @@ static int fuse_do_statx(struct mnt_idmap *idmap, struct inode *inode, 
	args.out_numargs = 1;

	args.out_args[0].size = sizeof(outarg);

	args.out_args[0].value = &outarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err)

		return err;
@@ -1280,7 +1280,7 @@ static int fuse_do_getattr(struct mnt_idmap *idmap, struct inode *inode, 
	args.out_numargs = 1;

	args.out_args[0].size = sizeof(outarg);

	args.out_args[0].value = &outarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (!err) {

		if (fuse_invalid_attr(&outarg.attr) ||

		    inode_wrong_type(inode, outarg.attr.mode)) {
@@ -1492,7 +1492,7 @@ static int fuse_access(struct inode *inode, int mask) 
	args.in_numargs = 1;

	args.in_args[0].size = sizeof(inarg);

	args.in_args[0].value = &inarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err == -ENOSYS) {

		fm->fc->no_access = 1;

		err = 0;
@@ -1604,7 +1604,7 @@ static int fuse_readlink_page(struct inode *inode, struct page *page) 
	ap.args.page_zeroing = true;

	ap.args.out_numargs = 1;

	ap.args.out_args[0].size = desc.length;

	res = fuse_simple_request(NULL, fm, &ap.args);

	res = fuse_simple_request(fm, &ap.args);



	fuse_invalidate_atime(inode);
@@ -1889,7 +1889,7 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff) 
	}

	fuse_setattr_fill(fm->fc, &args, inode, &inarg, &outarg);



	return fuse_simple_request(NULL, fm, &args);

	return fuse_simple_request(fm, &args);

}



/*
@@ -2002,7 +2002,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry, 
			inarg.valid |= FATTR_KILL_SUIDGID;

	}

	fuse_setattr_fill(fc, &args, inode, &inarg, &outarg);

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err) {

		if (err == -EINTR)

			fuse_invalidate_attr(inode);

fs/fuse/file.c

+16 −16
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int fuse_send_open(struct fuse_mount *fm, u64 nodeid, 
	args.out_args[0].size = sizeof(*outargp);

	args.out_args[0].value = outargp;



	return fuse_simple_request(NULL, fm, &args);

	return fuse_simple_request(fm, &args);

}



struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release)
@@ -111,7 +111,7 @@ static void fuse_file_put(struct fuse_file *ff, bool sync) 
		if (!args) {

			/* Do nothing when server does not implement 'open' */

		} else if (sync) {

			fuse_simple_request(NULL, ff->fm, args);

			fuse_simple_request(ff->fm, args);

			fuse_release_end(ff->fm, args, 0);

		} else {

			args->end = fuse_release_end;
@@ -539,7 +539,7 @@ static int fuse_flush(struct file *file, fl_owner_t id) 
	args.in_args[0].value = &inarg;

	args.force = true;



	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err == -ENOSYS) {

		fm->fc->no_flush = 1;

		err = 0;
@@ -572,7 +572,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end, 
	args.in_numargs = 1;

	args.in_args[0].size = sizeof(inarg);

	args.in_args[0].value = &inarg;

	return fuse_simple_request(NULL, fm, &args);

	return fuse_simple_request(fm, &args);

}



static int fuse_fsync(struct file *file, loff_t start, loff_t end,
@@ -814,7 +814,7 @@ static ssize_t fuse_send_read(struct fuse_io_args *ia, loff_t pos, size_t count, 
	if (ia->io->async)

		return fuse_async_req_send(fm, ia, count);



	return fuse_simple_request(NULL, fm, &ia->ap.args);

	return fuse_simple_request(fm, &ia->ap.args);

}



static void fuse_read_update_size(struct inode *inode, loff_t size,
@@ -878,7 +878,7 @@ static int fuse_do_readpage(struct file *file, struct page *page) 
		desc.length--;



	fuse_read_args_fill(&ia, file, pos, desc.length, FUSE_READ);

	res = fuse_simple_request(NULL, fm, &ia.ap.args);

	res = fuse_simple_request(fm, &ia.ap.args);

	if (res < 0)

		return res;

	/*
@@ -976,7 +976,7 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file) 
		if (!err)

			return;

	} else {

		res = fuse_simple_request(NULL, fm, &ap->args);

		res = fuse_simple_request(fm, &ap->args);

		err = res < 0 ? res : 0;

	}

	fuse_readpages_end(fm, &ap->args, err);
@@ -1101,7 +1101,7 @@ static ssize_t fuse_send_write(struct fuse_io_args *ia, loff_t pos, 
	if (ia->io->async)

		return fuse_async_req_send(fm, ia, count);



	err = fuse_simple_request(NULL, fm, &ia->ap.args);

	err = fuse_simple_request(fm, &ia->ap.args);

	if (!err && ia->write.out.size > count)

		err = -EIO;
@@ -1147,7 +1147,7 @@ static ssize_t fuse_send_write_pages(struct fuse_io_args *ia, 
	if (fm->fc->handle_killpriv_v2 && !capable(CAP_FSETID))

		ia->write.in.write_flags |= FUSE_WRITE_KILL_SUIDGID;



	err = fuse_simple_request(NULL, fm, &ap->args);

	err = fuse_simple_request(fm, &ap->args);

	if (!err && ia->write.out.size > count)

		err = -EIO;
@@ -2662,7 +2662,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl) 
	args.out_numargs = 1;

	args.out_args[0].size = sizeof(outarg);

	args.out_args[0].value = &outarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (!err)

		err = convert_fuse_file_lock(fm->fc, &outarg.lk, fl);
@@ -2686,7 +2686,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock) 
	}



	fuse_lk_fill(&args, file, fl, opcode, pid_nr, flock, &inarg);

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);



	/* locking is restartable */

	if (err == -EINTR)
@@ -2760,7 +2760,7 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block) 
	args.out_numargs = 1;

	args.out_args[0].size = sizeof(outarg);

	args.out_args[0].value = &outarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err == -ENOSYS)

		fm->fc->no_bmap = 1;
@@ -2792,7 +2792,7 @@ static loff_t fuse_lseek(struct file *file, loff_t offset, int whence) 
	args.out_numargs = 1;

	args.out_args[0].size = sizeof(outarg);

	args.out_args[0].value = &outarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err) {

		if (err == -ENOSYS) {

			fm->fc->no_lseek = 1;
@@ -2925,7 +2925,7 @@ __poll_t fuse_file_poll(struct file *file, poll_table *wait) 
	args.out_numargs = 1;

	args.out_args[0].size = sizeof(outarg);

	args.out_args[0].value = &outarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);



	if (!err)

		return demangle_poll(outarg.revents);
@@ -3147,7 +3147,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, 
	args.in_numargs = 1;

	args.in_args[0].size = sizeof(inarg);

	args.in_args[0].value = &inarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err == -ENOSYS) {

		fm->fc->no_fallocate = 1;

		err = -EOPNOTSUPP;
@@ -3259,7 +3259,7 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in, 
	args.out_numargs = 1;

	args.out_args[0].size = sizeof(outarg);

	args.out_args[0].value = &outarg;

	err = fuse_simple_request(NULL, fm, &args);

	err = fuse_simple_request(fm, &args);

	if (err == -ENOSYS) {

		fc->no_copy_file_range = 1;

		err = -EOPNOTSUPP;

fs/fuse/fuse_i.h

+16 −2
Original line number Diff line number Diff line
@@ -1147,8 +1147,22 @@ void __exit fuse_ctl_cleanup(void); 
/**

 * Simple request sending that does request allocation and freeing

 */

ssize_t fuse_simple_request(struct mnt_idmap *idmap, struct fuse_mount *fm,

ssize_t __fuse_simple_request(struct mnt_idmap *idmap,

			      struct fuse_mount *fm,

			      struct fuse_args *args);



static inline ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args)

{

	return __fuse_simple_request(NULL, fm, args);

}



static inline ssize_t fuse_simple_idmap_request(struct mnt_idmap *idmap,

						struct fuse_mount *fm,

						struct fuse_args *args)

{

	return __fuse_simple_request(idmap, fm, args);

}



int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args,

			   gfp_t gfp_flags);