aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-06-08 10:35:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-06-08 10:35:12 -0700
commit35b574a6c2279fe47d13ffafb8389f1adc87a1d1 (patch)
treeeebac68f13ccff9ad240e66688e79039a0030e8c /include
parentMerge tag '6.16-rc-part2-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff)
parentdo_change_type(): refuse to operate on unmounted/not ours mounts (diff)
downloadlinux-rng-35b574a6c2279fe47d13ffafb8389f1adc87a1d1.tar.xz
linux-rng-35b574a6c2279fe47d13ffafb8389f1adc87a1d1.zip
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull mount fixes from Al Viro: "Various mount-related bugfixes: - split the do_move_mount() checks in subtree-of-our-ns and entire-anon cases and adapt detached mount propagation selftest for mount_setattr - allow clone_private_mount() for a path on real rootfs - fix a race in call of has_locked_children() - fix move_mount propagation graph breakage by MOVE_MOUNT_SET_GROUP - make sure clone_private_mnt() caller has CAP_SYS_ADMIN in the right userns - avoid false negatives in path_overmount() - don't leak MNT_LOCKED from parent to child in finish_automount() - do_change_type(): refuse to operate on unmounted/not ours mounts" * tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: do_change_type(): refuse to operate on unmounted/not ours mounts clone_private_mnt(): make sure that caller has CAP_SYS_ADMIN in the right userns selftests/mount_setattr: adapt detached mount propagation test do_move_mount(): split the checks in subtree-of-our-ns and entire-anon cases fs: allow clone_private_mount() for a path on real rootfs fix propagation graph breakage by MOVE_MOUNT_SET_GROUP move_mount(2) finish_automount(): don't leak MNT_LOCKED from parent to child path_overmount(): avoid false negatives fs/fhandle.c: fix a race in call of has_locked_children()
Diffstat (limited to 'include')
-rw-r--r--include/linux/mount.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h
index d3ee0e5162f0..4880f434c021 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -65,7 +65,8 @@ enum mount_flags {
MNT_ATIME_MASK = MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME,
MNT_INTERNAL_FLAGS = MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL |
- MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED,
+ MNT_DOOMED | MNT_SYNC_UMOUNT | MNT_MARKED |
+ MNT_LOCKED,
};
struct vfsmount {