This gets rid of "no_control" related code since
nobody uses it.
Signed-off-by: Xie Yongji <xieyongji@xxxxxxxxxxxxx>
---
fs/fuse/fuse_i.h | 4 ----
fs/fuse/inode.c | 1 -
fs/fuse/virtio_fs.c | 1 -
3 files changed, 6 deletions(-)
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
index 488b460e046f..a47f14d0ee3f 100644
--- a/fs/fuse/fuse_i.h
+++ b/fs/fuse/fuse_i.h
@@ -507,7 +507,6 @@ struct fuse_fs_context {
bool default_permissions:1;
bool allow_other:1;
bool destroy:1;
- bool no_control:1;
bool no_force_umount:1;
bool legacy_opts_show:1;
enum fuse_dax_mode dax_mode;
@@ -766,9 +765,6 @@ struct fuse_conn {
/* Delete dentries that have gone stale */
unsigned int delete_stale:1;
- /** Do not create entry in fusectl fs */
- unsigned int no_control:1;
-
/** Do not allow MNT_FORCE umount */
unsigned int no_force_umount:1;
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 8c0665c5dff8..4059c6898e08 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -1564,7 +1564,6 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx)
fc->legacy_opts_show = ctx->legacy_opts_show;
fc->max_read = max_t(unsigned int, 4096, ctx->max_read);
fc->destroy = ctx->destroy;
- fc->no_control = ctx->no_control;
fc->no_force_umount = ctx->no_force_umount;
err = -ENOMEM;
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
index 8db53fa67359..24bcf4dbca2a 100644
--- a/fs/fuse/virtio_fs.c
+++ b/fs/fuse/virtio_fs.c
@@ -1287,7 +1287,6 @@ static inline void virtio_fs_ctx_set_defaults(struct fuse_fs_context *ctx)
ctx->max_read = UINT_MAX;
ctx->blksize = 512;
ctx->destroy = true;
- ctx->no_control = true;
ctx->no_force_umount = true;
}
--
2.20.1
