[PATCH 01/14] fs: remove the unused SB_I_MULTIROOT flag
The last user of SB_I_MULTIROOT is disappeared with commit f2aedb713c28 ("NFS: Add fs_context support.") Signed-off-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn --- 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 41cd993ec0f686..236543605dd118 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1366,7 +1366,6 @@ extern int send_sigurg(struct fown_struct *fown); #define SB_I_CGROUPWB 0x0001 /* cgroup-aware writeback enabled */ #define SB_I_NOEXEC0x0002 /* Ignore executables on this fs */ #define SB_I_NODEV 0x0004 /* Ignore devices on this fs */ -#define SB_I_MULTIROOT 0x0008 /* Multiple roots to the dentry tree */ /* sb->s_iflags to limit user namespace mounts */ #define SB_I_USERNS_VISIBLE0x0010 /* fstype already mounted */ -- 2.27.0
[PATCH 01/14] fs: remove the unused SB_I_MULTIROOT flag
The last user of SB_I_MULTIROOT is disappeared with commit f2aedb713c28 ("NFS: Add fs_context support.") Signed-off-by: Christoph Hellwig Reviewed-by: Johannes Thumshirn --- 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 41cd993ec0f686..236543605dd118 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1366,7 +1366,6 @@ extern int send_sigurg(struct fown_struct *fown); #define SB_I_CGROUPWB 0x0001 /* cgroup-aware writeback enabled */ #define SB_I_NOEXEC0x0002 /* Ignore executables on this fs */ #define SB_I_NODEV 0x0004 /* Ignore devices on this fs */ -#define SB_I_MULTIROOT 0x0008 /* Multiple roots to the dentry tree */ /* sb->s_iflags to limit user namespace mounts */ #define SB_I_USERNS_VISIBLE0x0010 /* fstype already mounted */ -- 2.27.0
Re: [PATCH 01/14] fs: remove the unused SB_I_MULTIROOT flag
A little bit of git archeology shows the last user of SB_I_MULTIROOT is gone with f2aedb713c28 ("NFS: Add fs_context support.") Reviewed-by: Johannes Thumshirn
[PATCH 01/14] fs: remove the unused SB_I_MULTIROOT flag
Signed-off-by: Christoph Hellwig --- 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 41cd993ec0f686..236543605dd118 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1366,7 +1366,6 @@ extern int send_sigurg(struct fown_struct *fown); #define SB_I_CGROUPWB 0x0001 /* cgroup-aware writeback enabled */ #define SB_I_NOEXEC0x0002 /* Ignore executables on this fs */ #define SB_I_NODEV 0x0004 /* Ignore devices on this fs */ -#define SB_I_MULTIROOT 0x0008 /* Multiple roots to the dentry tree */ /* sb->s_iflags to limit user namespace mounts */ #define SB_I_USERNS_VISIBLE0x0010 /* fstype already mounted */ -- 2.27.0
[PATCH 01/14] fs: remove the unused SB_I_MULTIROOT flag
Signed-off-by: Christoph Hellwig --- 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 0x0001 /* cgroup-aware writeback enabled */ #define SB_I_NOEXEC0x0002 /* Ignore executables on this fs */ #define SB_I_NODEV 0x0004 /* Ignore devices on this fs */ -#define SB_I_MULTIROOT 0x0008 /* Multiple roots to the dentry tree */ /* sb->s_iflags to limit user namespace mounts */ #define SB_I_USERNS_VISIBLE0x0010 /* fstype already mounted */ -- 2.27.0