diff options
author | Christian Brauner <brauner@kernel.org> | 2025-01-09 17:03:21 +0100 |
---|---|---|
committer | Christian Brauner <brauner@kernel.org> | 2025-01-09 17:03:21 +0100 |
commit | 482d520d86e889cf40d8173388a498375079cab6 (patch) | |
tree | c950c28b12fff2d24953b4615ec1fa64c681bd10 /include | |
parent | iomap: avoid avoid truncating 64-bit offset to 32 bits (diff) | |
parent | fs: kill MNT_ONRB (diff) | |
download | linux-482d520d86e889cf40d8173388a498375079cab6.tar.xz linux-482d520d86e889cf40d8173388a498375079cab6.zip |
Merge tag 'vfs-6.14-rc7.mount.fixes'
Bring in the fix for the mount namespace rbtree. It is used as the base
for the vfs mount work for this cycle and so shouldn't be applied
directly.
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mount.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h index c34c18b4e8f3..04213d8ef837 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -50,7 +50,7 @@ struct path; #define MNT_ATIME_MASK (MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME ) #define MNT_INTERNAL_FLAGS (MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL | \ - MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED | MNT_ONRB) + MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED) #define MNT_INTERNAL 0x4000 @@ -64,7 +64,6 @@ struct path; #define MNT_SYNC_UMOUNT 0x2000000 #define MNT_MARKED 0x4000000 #define MNT_UMOUNT 0x8000000 -#define MNT_ONRB 0x10000000 struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ |