summaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorEric W. Biederman2016-06-09 22:44:48 +0200
committerEric W. Biederman2016-06-23 22:47:31 +0200
commitcc50a07a247e17db76b1f0b0ca06652556e04fa3 (patch)
tree64060a2d84ef06285de1f1a13008899dec16a2dc /include/linux/fs.h
parentuserns: Remove implicit MNT_NODEV fragility. (diff)
downloadkernel-qcow2-linux-cc50a07a247e17db76b1f0b0ca06652556e04fa3.tar.gz
kernel-qcow2-linux-cc50a07a247e17db76b1f0b0ca06652556e04fa3.tar.xz
kernel-qcow2-linux-cc50a07a247e17db76b1f0b0ca06652556e04fa3.zip
userns: Remove the now unnecessary FS_USERNS_DEV_MOUNT flag
Now that SB_I_NODEV controls the nodev behavior devpts can just clear this flag during mount. Simplifying the code and making it easier to audit how the code works. While still preserving the invariant that s_iflags is only modified during mount. Acked-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e05983170d23..375e37f42cdf 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2022,7 +2022,6 @@ struct file_system_type {
#define FS_BINARY_MOUNTDATA 2
#define FS_HAS_SUBTYPE 4
#define FS_USERNS_MOUNT 8 /* Can be mounted by userns root */
-#define FS_USERNS_DEV_MOUNT 16 /* A userns mount does not imply MNT_NODEV */
#define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during rename() internally. */
struct dentry *(*mount) (struct file_system_type *, int,
const char *, void *);