diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2019-08-29 11:01:20 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2019-09-12 14:59:41 +0200 |
| commit | 783863d6476ce9f27fa87227f76ae9134caf43fa (patch) | |
| tree | 98acd92b40d5a92fa7afbd704ed39d42f639c932 /fs/fuse | |
| parent | 8fab010644363f8f80194322aa7a81e38c867af3 (diff) | |
| download | linux-stable-783863d6476ce9f27fa87227f76ae9134caf43fa.tar.gz linux-stable-783863d6476ce9f27fa87227f76ae9134caf43fa.tar.bz2 linux-stable-783863d6476ce9f27fa87227f76ae9134caf43fa.zip | |
fuse: dissociate DESTROY from fuseblk
Allow virtio-fs to also send DESTROY request.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/fuse_i.h | 9 | ||||
| -rw-r--r-- | fs/fuse/inode.c | 12 |
2 files changed, 17 insertions, 4 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index fed68a427a4c..48d214df9172 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -467,6 +467,7 @@ struct fuse_fs_context { bool group_id_present:1; bool default_permissions:1; bool allow_other:1; + bool destroy:1; unsigned int max_read; unsigned int blksize; const char *subtype; @@ -946,6 +947,13 @@ void fuse_send_init(struct fuse_conn *fc); int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx); /** + * Disassociate fuse connection from superblock and kill the superblock + * + * Calls kill_anon_super(), do not use with bdev mounts. + */ +void fuse_kill_sb_anon(struct super_block *sb); + +/** * Add connection to control filesystem */ int fuse_ctl_add_conn(struct fuse_conn *fc); @@ -1057,5 +1065,6 @@ unsigned int fuse_len_args(unsigned int numargs, struct fuse_arg *args); * Get the next unique ID for a request */ u64 fuse_get_unique(struct fuse_iqueue *fiq); +void fuse_free_conn(struct fuse_conn *fc); #endif /* _FS_FUSE_I_H */ diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 6a0f31faaeaa..cd6ffb3fe69e 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -999,11 +999,12 @@ void fuse_send_init(struct fuse_conn *fc) } EXPORT_SYMBOL_GPL(fuse_send_init); -static void fuse_free_conn(struct fuse_conn *fc) +void fuse_free_conn(struct fuse_conn *fc) { WARN_ON(!list_empty(&fc->devices)); kfree_rcu(fc, rcu); } +EXPORT_SYMBOL_GPL(fuse_free_conn); static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb) { @@ -1169,7 +1170,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) fc->user_id = ctx->user_id; fc->group_id = ctx->group_id; fc->max_read = max_t(unsigned, 4096, ctx->max_read); - fc->destroy = ctx->is_bdev; + fc->destroy = ctx->destroy; err = -ENOMEM; root = fuse_get_root_inode(sb, ctx->rootmode); @@ -1293,8 +1294,10 @@ static int fuse_init_fs_context(struct fs_context *fc) ctx->blksize = FUSE_DEFAULT_BLKSIZE; #ifdef CONFIG_BLOCK - if (fc->fs_type == &fuseblk_fs_type) + if (fc->fs_type == &fuseblk_fs_type) { ctx->is_bdev = true; + ctx->destroy = true; + } #endif fc->fs_private = ctx; @@ -1319,11 +1322,12 @@ static void fuse_sb_destroy(struct super_block *sb) } } -static void fuse_kill_sb_anon(struct super_block *sb) +void fuse_kill_sb_anon(struct super_block *sb) { fuse_sb_destroy(sb); kill_anon_super(sb); } +EXPORT_SYMBOL_GPL(fuse_kill_sb_anon); static struct file_system_type fuse_fs_type = { .owner = THIS_MODULE, |