lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 410/545] fuse: Remove the control interface for virtio-fs
    Date
    From: Xie Yongji <xieyongji@bytedance.com>

    [ Upstream commit c64797809a64c73497082aa05e401a062ec1af34 ]

    The commit 15c8e72e88e0 ("fuse: allow skipping control interface and forced
    unmount") tries to remove the control interface for virtio-fs since it does
    not support aborting requests which are being processed. But it doesn't
    work now.

    This patch fixes it by skipping creating the control interface if
    fuse_conn->no_control is set.

    Fixes: 15c8e72e88e0 ("fuse: allow skipping control interface and forced unmount")
    Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
    Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/fuse/control.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/fuse/control.c b/fs/fuse/control.c
    index cc7e94d73c6c..24b4d9db231d 100644
    --- a/fs/fuse/control.c
    +++ b/fs/fuse/control.c
    @@ -275,7 +275,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc)
    struct dentry *parent;
    char name[32];

    - if (!fuse_control_sb)
    + if (!fuse_control_sb || fc->no_control)
    return 0;

    parent = fuse_control_sb->s_root;
    @@ -313,7 +313,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc)
    {
    int i;

    - if (!fuse_control_sb)
    + if (!fuse_control_sb || fc->no_control)
    return;

    for (i = fc->ctl_ndents - 1; i >= 0; i--) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:44    [W:4.029 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site