lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 174/215] fuse: use ->reconfigure() instead of ->remount_fs()
    Date
    From: Miklos Szeredi <mszeredi@redhat.com>

    commit 0189a2d367f49729622fdafaef5da73161591859 upstream.

    s_op->remount_fs() is only called from legacy_reconfigure(), which is not
    used after being converted to the new API.

    Convert to using ->reconfigure(). This restores the previous behavior of
    syncing the filesystem and rejecting MS_MANDLOCK on remount.

    Fixes: c30da2e981a7 ("fuse: convert to use the new mount API")
    Cc: <stable@vger.kernel.org> # v5.4
    Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/fuse/inode.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/fs/fuse/inode.c
    +++ b/fs/fuse/inode.c
    @@ -121,10 +121,12 @@ static void fuse_evict_inode(struct inod
    }
    }

    -static int fuse_remount_fs(struct super_block *sb, int *flags, char *data)
    +static int fuse_reconfigure(struct fs_context *fc)
    {
    + struct super_block *sb = fc->root->d_sb;
    +
    sync_filesystem(sb);
    - if (*flags & SB_MANDLOCK)
    + if (fc->sb_flags & SB_MANDLOCK)
    return -EINVAL;

    return 0;
    @@ -822,7 +824,6 @@ static const struct super_operations fus
    .evict_inode = fuse_evict_inode,
    .write_inode = fuse_write_inode,
    .drop_inode = generic_delete_inode,
    - .remount_fs = fuse_remount_fs,
    .put_super = fuse_put_super,
    .umount_begin = fuse_umount_begin,
    .statfs = fuse_statfs,
    @@ -1296,6 +1297,7 @@ static int fuse_get_tree(struct fs_conte
    static const struct fs_context_operations fuse_context_ops = {
    .free = fuse_free_fc,
    .parse_param = fuse_parse_param,
    + .reconfigure = fuse_reconfigure,
    .get_tree = fuse_get_tree,
    };


    \
     
     \ /
      Last update: 2020-07-20 18:04    [W:4.281 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site