| Message ID | 20230110022554.1186499-4-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fs: kill old ms_* flags for internal sb | expand |
On Mon, Jan 09, 2023 at 06:25:54PM -0800, Luis Chamberlain wrote: > During commit e462ec50cb5 ("VFS: Differentiate mount flags (MS_*) from > internal superblock flags") Christoph had suggested we should eventually > remove these old flags which were exposed to userspace but could not > be used as they were internal-only. > > Nuke them. Umm... They are still exposed to userland after your series, though. IOW, we can't change the bit assignment of e.g. SB_ACTIVE - the apparmor part will break, etc. If anything, it would be more honest to lift the "we ignore those bits" logics to path_mount()...
diff --git a/include/uapi/linux/mount.h b/include/uapi/linux/mount.h index 4d93967f8aea..eb6617a5426b 100644 --- a/include/uapi/linux/mount.h +++ b/include/uapi/linux/mount.h @@ -38,14 +38,6 @@ #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ #define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */ -/* These sb flags are internal to the kernel */ -#define MS_SUBMOUNT (1<<26) -#define MS_NOREMOTELOCK (1<<27) -#define MS_NOSEC (1<<28) -#define MS_BORN (1<<29) -#define MS_ACTIVE (1<<30) -#define MS_NOUSER (1<<31) - /* * Superblock flags that can be altered by MS_REMOUNT */ diff --git a/tools/include/uapi/linux/mount.h b/tools/include/uapi/linux/mount.h index 4d93967f8aea..eb6617a5426b 100644 --- a/tools/include/uapi/linux/mount.h +++ b/tools/include/uapi/linux/mount.h @@ -38,14 +38,6 @@ #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ #define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */ -/* These sb flags are internal to the kernel */ -#define MS_SUBMOUNT (1<<26) -#define MS_NOREMOTELOCK (1<<27) -#define MS_NOSEC (1<<28) -#define MS_BORN (1<<29) -#define MS_ACTIVE (1<<30) -#define MS_NOUSER (1<<31) - /* * Superblock flags that can be altered by MS_REMOUNT */
During commit e462ec50cb5 ("VFS: Differentiate mount flags (MS_*) from internal superblock flags") Christoph had suggested we should eventually remove these old flags which were exposed to userspace but could not be used as they were internal-only. Nuke them. Suggested-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- include/uapi/linux/mount.h | 8 -------- tools/include/uapi/linux/mount.h | 8 -------- 2 files changed, 16 deletions(-)