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 01/14] fs: remove the unused SB_I_MULTIROOT flag
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    fs/namei.c | 4 ++--
    include/linux/fs.h | 1 -
    2 files changed, 2 insertions(+), 3 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 72d4219c93acb7..e9ff0d54a110a7 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -568,8 +568,8 @@ static bool path_connected(struct vfsmount *mnt, struct dentry *dentry)
    {
    struct super_block *sb = mnt->mnt_sb;

    - /* Bind mounts and multi-root filesystems can have disconnected paths */
    - if (!(sb->s_iflags & SB_I_MULTIROOT) && (mnt->mnt_root == sb->s_root))
    + /* Bind mounts can have disconnected paths */
    + if (mnt->mnt_root == sb->s_root)
    return true;

    return is_subdir(dentry, mnt->mnt_root);
    diff --git a/include/linux/fs.h b/include/linux/fs.h
    index 1d7c4f7465d24c..613323008519ca 100644
    --- a/include/linux/fs.h
    +++ b/include/linux/fs.h
    @@ -1365,7 +1365,6 @@ extern int send_sigurg(struct fown_struct *fown);
    #define SB_I_CGROUPWB 0x00000001 /* cgroup-aware writeback enabled */
    #define SB_I_NOEXEC 0x00000002 /* Ignore executables on this fs */
    #define SB_I_NODEV 0x00000004 /* Ignore devices on this fs */
    -#define SB_I_MULTIROOT 0x00000008 /* Multiple roots to the dentry tree */

    /* sb->s_iflags to limit user namespace mounts */
    #define SB_I_USERNS_VISIBLE 0x00000010 /* fstype already mounted */
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-07-20 09:54    [W:2.274 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site