[PATCH 23/52] fuse: simplify fuse_fill_super_common() calling

Vivek Goyal
2018-12-10T17:12:49Z

From: Miklos Szeredi <mszeredi@redhat.com>

Add more fields to "struct fuse_mount_data" so that less parameters
have to be passed to function fuse_fill_super_common().

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---
fs/fuse/fuse_i.h | 22 +++++++++++++---------
fs/fuse/inode.c | 27 ++++++++++++++-------------
fs/fuse/virtio_fs.c | 10 +++++++---
3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index f0775d76e31f..fb49ca9d05ac 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -77,6 +77,18 @@ struct fuse_mount_data {
unsigned dax:1;
unsigned max_read;
unsigned blksize;
+
+ /* DAX device, may be NULL */
+ struct dax_device *dax_dev;
+
+ /* fuse input queue operations */
+ const struct fuse_iqueue_ops *fiq_ops;
+
+ /* device-specific state for fuse_iqueue */
+ void *fiq_priv;
+
+ /* fuse_dev pointer to fill in, should contain NULL on entry */
+ void **fudptr;
};

/* One forget request */
@@ -1073,17 +1085,9 @@ int parse_fuse_opt(char *opt, struct fuse_mount_data *d, int is_bdev,
* Fill in superblock and initialize fuse connection
* @sb: partially-initialized superblock to fill in
* @mount_data: mount parameters
- * @dax_dev: DAX device, may be NULL
- * @fiq_ops: fuse input queue operations
- * @fiq_priv: device-specific state for fuse_iqueue
- * @fudptr: fuse_dev pointer to fill in, should contain NULL on entry
*/
int fuse_fill_super_common(struct super_block *sb,
- struct fuse_mount_data *mount_data,
- struct dax_device *dax_dev,
- const struct fuse_iqueue_ops *fiq_ops,
- void *fiq_priv,
- void **fudptr);
+ struct fuse_mount_data *mount_data);

/**
* Disassociate fuse connection from superblock and kill the superblock
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 403360e352d8..075997977cfd 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1149,11 +1149,7 @@ void fuse_dev_free(struct fuse_dev *fud)
EXPORT_SYMBOL_GPL(fuse_dev_free);

int fuse_fill_super_common(struct super_block *sb,
- struct fuse_mount_data *mount_data,
- struct dax_device *dax_dev,
- const struct fuse_iqueue_ops *fiq_ops,
- void *fiq_priv,
- void **fudptr)
+ struct fuse_mount_data *mount_data)
{
struct fuse_dev *fud;
struct fuse_conn *fc;
@@ -1201,11 +1197,12 @@ int fuse_fill_super_common(struct super_block *sb,
if (!fc)
goto err;

- fuse_conn_init(fc, sb->s_user_ns, dax_dev, fiq_ops, fiq_priv);
+ fuse_conn_init(fc, sb->s_user_ns, mount_data->dax_dev,
+ mount_data->fiq_ops, mount_data->fiq_priv);
fc->release = fuse_free_conn;

- if (dax_dev) {
- err = fuse_dax_mem_range_init(fc, dax_dev);
+ if (mount_data->dax_dev) {
+ err = fuse_dax_mem_range_init(fc, mount_data->dax_dev);
if (err) {
pr_debug("fuse_dax_mem_range_init() returned %d\n", err);
goto err_put_conn;
@@ -1259,7 +1256,7 @@ int fuse_fill_super_common(struct super_block *sb,

mutex_lock(&fuse_mutex);
err = -EINVAL;
- if (*fudptr)
+ if (*mount_data->fudptr)
goto err_unlock;

err = fuse_ctl_add_conn(fc);
@@ -1268,7 +1265,7 @@ int fuse_fill_super_common(struct super_block *sb,

list_add_tail(&fc->entry, &fuse_conn_list);
sb->s_root = root_dentry;
- *fudptr = fud;
+ *mount_data->fudptr = fud;
/*
* mutex_unlock() provides the necessary memory barrier for
* *fudptr to be visible on all CPUs after this
@@ -1288,7 +1285,7 @@ int fuse_fill_super_common(struct super_block *sb,
err_dev_free:
fuse_dev_free(fud);
err_free_ranges:
- if (dax_dev)
+ if (mount_data->dax_dev)
fuse_free_dax_mem_ranges(&fc->free_ranges);
err_put_conn:
fuse_conn_put(fc);
@@ -1323,8 +1320,12 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
(file->f_cred->user_ns != sb->s_user_ns))
goto err_fput;

- err = fuse_fill_super_common(sb, &d, NULL, &fuse_dev_fiq_ops, NULL,
- &file->private_data);
+ d.dax_dev = NULL;
+ d.fiq_ops = &fuse_dev_fiq_ops;
+ d.fiq_priv = NULL;
+ d.fudptr = &file->private_data;
+ err = fuse_fill_super_common(sb, &d);
+
err_fput:
fput(file);
err:
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index c79c9a885253..98dba3cf9d40 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -1053,9 +1053,13 @@ static int virtio_fs_fill_super(struct super_block *sb, void *data,
/* TODO this sends FUSE_INIT and could cause hiprio or notifications
* virtqueue races since they haven't been set up yet!
*/
- err = fuse_fill_super_common(sb, &d, d.dax ? fs->dax_dev : NULL,
- &virtio_fs_fiq_ops, fs,
- (void **)&fs->vqs[2].fud);
+
+ d.dax_dev = d.dax ? fs->dax_dev : NULL;
+ d.fiq_ops = &virtio_fs_fiq_ops;
+ d.fiq_priv = fs;
+ d.fudptr = (void **)&fs->vqs[2].fud;
+ err = fuse_fill_super_common(sb, &d);
+
if (err < 0)
goto err_fud;

--
2.13.6