statfs: handle mount propagation
cover statfs: handle mount propagation
Hey,
This is a resend of this to CC more people and because it seems to have gotten lost in the prior merge window. I should've sent it afterwards right away.
This series:
- unifies the definition of constants in statfs.h and fs.h Please note the comments by Greg and others on this part:
https://patchwork.kernel.org/patch/10340403/
https://patchwork.kernel.org/patch/10340379/
I haven't yet changed the fs.h and statfs.h header changes to not bitshifts. I wanted to wait what Al would think of it.
- extends statfs to handle mount propagation. This will let userspace easily query a given mountpoint for MS_UNBINDABLE, MS_SHARED, MS_PRIVATE and MS_SLAVE without always having to do costly parsing of /proc/<pid>/mountinfo.
To this end the flags:
- ST_UNBINDABLE
- ST_SHARED
- ST_PRIVATE
- ST_SLAVE
are added. They have the same value as their MS_* counterparts.
The patchset was made against Al's vfs/for-next tree.
Thanks!
Christian
Christian Brauner (6):
fs: use << for MS_* flags
statfs: use << to align with fs header
statfs: add ST_UNBINDABLE
statfs: add ST_SHARED
statfs: add ST_PRIVATE
statfs: add ST_SLAVE
fs/statfs.c | 16 +++++++++++++++- include/linux/statfs.h | 30 +++++++++++++++++------------- include/uapi/linux/fs.h | 33 +++++++++++++++++---------------- 3 files changed, 49 insertions(+), 30 deletions(-)
Signature · 1 line
2.17.0
PATCH RESEND 1/6 fs: use << for MS_* flags
Consistenly use << to define MS_* constants.
--- include/uapi/linux/fs.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
include/uapi/linux/fs.h +17 -16
@@ -105,22 +105,23 @@ struct inodes_stat_t {/* * These are the fs-independent mount-flags: up to 32 flags are supported */ -#define MS_RDONLY 1/* Mount read-only */ -#define MS_NOSUID 2/* Ignore suid and sgid bits */ -#define MS_NODEV 4/* Disallow access to device special files */ -#define MS_NOEXEC 8/* Disallow program execution */ -#define MS_SYNCHRONOUS 16/* Writes are synced at once */ -#define MS_REMOUNT 32/* Alter flags of a mounted FS */ -#define MS_MANDLOCK 64/* Allow mandatory locks on an FS */ -#define MS_DIRSYNC 128/* Directory modifications are synchronous */ -#define MS_NOATIME 1024/* Do not update access times. */ -#define MS_NODIRATIME 2048/* Do not update directory access times */ -#define MS_BIND 4096 -#define MS_MOVE 8192 -#define MS_REC 16384 -#define MS_VERBOSE 32768/* War is peace. Verbosity is silence. -MS_VERBOSE is deprecated. */ -#define MS_SILENT 32768 +#define MS_RDONLY (1<<0)/* Mount read-only */ +#define MS_NOSUID (1<<1)/* Ignore suid and sgid bits */ +#define MS_NODEV (1<<2)/* Disallow access to device special files */ +#define MS_NOEXEC (1<<3)/* Disallow program execution */ +#define MS_SYNCHRONOUS (1<<4)/* Writes are synced at once */ +#define MS_REMOUNT (1<<5)/* Alter flags of a mounted FS */ +#define MS_MANDLOCK (1<<6)/* Allow mandatory locks on an FS */ +#define MS_DIRSYNC (1<<7)/* Directory modifications are synchronous */ +#define MS_NOATIME (1<<10)/* Do not update access times. */ +#define MS_NODIRATIME (1<<11)/* Do not update directory access times */ +#define MS_BIND (1<<12) +#define MS_MOVE (1<<13) +#define MS_REC (1<<14) +#define MS_VERBOSE (1<<15)/* War is peace. Verbosity is silence. +* MS_VERBOSE is deprecated. +*/ +#define MS_SILENT (1<<15)#define MS_POSIXACL (1<<16)/* VFS does not apply the umask */ #define MS_UNBINDABLE (1<<17)/* change to unbindable */ #define MS_PRIVATE (1<<18)/* change to private */
Signature · 1 line
2.17.0
PATCH RESEND 2/6 statfs: use << to align with fs header
In reply to Christian BraunerConsistenly use << to define ST_* constants. This also aligns them with their MS_* counterparts in fs.h
--- include/linux/statfs.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
include/linux/statfs.h +13 -13
@@ -27,18 +27,18 @@ struct kstatfs {* ABI. The exception is ST_VALID which has the same value as MS_REMOUNT * which doesn't make any sense for statfs. */ -#define ST_RDONLY 0x0001/* mount read-only */ -#define ST_NOSUID 0x0002/* ignore suid and sgid bits */ -#define ST_NODEV 0x0004/* disallow access to device special files */ -#define ST_NOEXEC 0x0008/* disallow program execution */ -#define ST_SYNCHRONOUS 0x0010/* writes are synced at once */ -#define ST_VALID 0x0020/* f_flags support is implemented */ -#define ST_MANDLOCK 0x0040/* allow mandatory locks on an FS */ -/* 0x0080 used for ST_WRITE in glibc */ -/* 0x0100 used for ST_APPEND in glibc */ -/* 0x0200 used for ST_IMMUTABLE in glibc */ -#define ST_NOATIME 0x0400/* do not update access times */ -#define ST_NODIRATIME 0x0800/* do not update directory access times */ -#define ST_RELATIME 0x1000/* update atime relative to mtime/ctime */ +#define ST_RDONLY (1<<0)/* mount read-only */ +#define ST_NOSUID (1<<1)/* ignore suid and sgid bits */ +#define ST_NODEV (1<<2)/* disallow access to device special files */ +#define ST_NOEXEC (1<<3)/* disallow program execution */ +#define ST_SYNCHRONOUS (1<<4)/* writes are synced at once */ +#define ST_VALID (1<<5)/* f_flags support is implemented */ +#define ST_MANDLOCK (1<<6)/* allow mandatory locks on an FS */ +/* (1<<7) used for ST_WRITE in glibc */ +/* (1<<8) used for ST_APPEND in glibc */ +/* (1<<9) used for ST_IMMUTABLE in glibc */ +#define ST_NOATIME (1<<10)/* do not update access times */ +#define ST_NODIRATIME (1<<11)/* do not update directory access times */ +#define ST_RELATIME (1<<12)/* update atime relative to mtime/ctime */ #endif
Signature · 1 line
2.17.0
PATCH RESEND 3/6 statfs: add ST_UNBINDABLE
In reply to Christian BraunerThis lets userspace query whether a mountpoint was made MS_UNBINDABLE.
--- fs/statfs.c | 2 ++ include/linux/statfs.h | 1 + 2 files changed, 3 insertions(+)
fs/statfs.c +2 -0
@@ -29,6 +29,8 @@ static int flags_by_mnt(int mnt_flags) flags |=ST_NODIRATIME ;if (mnt_flags &MNT_RELATIME ) flags |=ST_RELATIME ; +if (mnt_flags &MNT_UNBINDABLE ) + flags |=ST_UNBINDABLE ;return flags; }
include/linux/statfs.h +1 -0
@@ -40,5 +40,6 @@ struct kstatfs {#define ST_NOATIME (1<<10)/* do not update access times */ #define ST_NODIRATIME (1<<11)/* do not update directory access times */ #define ST_RELATIME (1<<12)/* update atime relative to mtime/ctime */ +#define ST_UNBINDABLE (1<<17)/* change to unbindable */ #endif
Signature · 1 line
2.17.0
PATCH RESEND 4/6 statfs: add ST_SHARED
In reply to Christian BraunerThis lets userspace query whether a mountpoint was made MS_SHARED.
--- fs/statfs.c | 2 ++ include/linux/statfs.h | 1 + 2 files changed, 3 insertions(+)
fs/statfs.c +2 -0
@@ -31,6 +31,8 @@ static int flags_by_mnt(int mnt_flags) flags |=ST_RELATIME ;if (mnt_flags &MNT_UNBINDABLE ) flags |=ST_UNBINDABLE ; +if (mnt_flags &MNT_SHARED ) + flags |=ST_SHARED ;return flags; }
include/linux/statfs.h +1 -0
@@ -41,5 +41,6 @@ struct kstatfs {#define ST_NODIRATIME (1<<11)/* do not update directory access times */ #define ST_RELATIME (1<<12)/* update atime relative to mtime/ctime */ #define ST_UNBINDABLE (1<<17)/* change to unbindable */ +#define ST_SHARED (1<<20)/* change to shared */ #endif
Signature · 1 line
2.17.0
PATCH RESEND 5/6 statfs: add ST_PRIVATE
In reply to Christian BraunerThis lets userspace query whether a mountpoint was made MS_PRIVATE.
--- fs/statfs.c | 2 ++ include/linux/statfs.h | 1 + 2 files changed, 3 insertions(+)
fs/statfs.c +2 -0
@@ -33,6 +33,8 @@ static int flags_by_mnt(int mnt_flags) flags |=ST_UNBINDABLE ;if (mnt_flags &MNT_SHARED ) flags |=ST_SHARED ; +else + flags |=ST_PRIVATE ;return flags; }
include/linux/statfs.h +1 -0
@@ -41,6 +41,7 @@ struct kstatfs {#define ST_NODIRATIME (1<<11)/* do not update directory access times */ #define ST_RELATIME (1<<12)/* update atime relative to mtime/ctime */ #define ST_UNBINDABLE (1<<17)/* change to unbindable */ +#define ST_PRIVATE (1<<18)/* change to private */ #define ST_SHARED (1<<20)/* change to shared */ #endif
Signature · 1 line
2.17.0
PATCH RESEND 6/6 statfs: add ST_SLAVE
In reply to Christian BraunerThis lets userspace query whether a mountpoint was made MS_SLAVE.
--- fs/statfs.c | 10 +++++++++- include/linux/statfs.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-)
fs/statfs.c +9 -1
@@ -10,6 +10,7 @@#include <linux/uaccess.h> #include <linux/compat.h> #include "internal.h" +#include "pnode.h" static int flags_by_mnt (int mnt_flags) {
@@ -52,8 +53,15 @@ static int flags_by_sb(int s_flags)static int calculate_f_flags (struct vfsmount *mnt) { -return ST_VALID |flags_by_mnt (mnt->mnt_flags) | +int flags =0 ; + + flags =ST_VALID |flags_by_mnt (mnt->mnt_flags) |flags_by_sb (mnt->mnt_sb->s_flags); + +if (IS_MNT_SLAVE (real_mount (mnt))) + flags |=ST_SLAVE ; + +return flags; }static int statfs_by_dentry (struct dentry *dentry,struct kstatfs *buf)
include/linux/statfs.h +1 -0
@@ -42,6 +42,7 @@ struct kstatfs {#define ST_RELATIME (1<<12)/* update atime relative to mtime/ctime */ #define ST_UNBINDABLE (1<<17)/* change to unbindable */ #define ST_PRIVATE (1<<18)/* change to private */ +#define ST_SLAVE (1<<19)/* change to slave */ #define ST_SHARED (1<<20)/* change to shared */ #endif
Signature · 1 line
2.17.0