summaryrefslogtreecommitdiff
path: root/fs/super.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2016-06-09 20:44:48 (GMT)
committerEric W. Biederman <ebiederm@xmission.com>2016-06-23 20:47:31 (GMT)
commitcc50a07a247e17db76b1f0b0ca06652556e04fa3 (patch)
tree64060a2d84ef06285de1f1a13008899dec16a2dc /fs/super.c
parent67690f937c38bbab1d94cb45f6a32e61612834ae (diff)
downloadlinux-cc50a07a247e17db76b1f0b0ca06652556e04fa3.tar.xz
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 'fs/super.c')
-rw-r--r--fs/super.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/super.c b/fs/super.c
index 25cdceed2..37813bf 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -206,8 +206,7 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags,
init_waitqueue_head(&s->s_writers.wait_unfrozen);
s->s_bdi = &noop_backing_dev_info;
s->s_flags = flags;
- if ((s->s_user_ns != &init_user_ns) &&
- !(type->fs_flags & FS_USERNS_DEV_MOUNT))
+ if (s->s_user_ns != &init_user_ns)
s->s_iflags |= SB_I_NODEV;
INIT_HLIST_NODE(&s->s_instances);
INIT_HLIST_BL_HEAD(&s->s_anon);