diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2016-06-09 22:44:48 +0200 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2016-06-23 22:47:31 +0200 |
| commit | cc50a07a247e17db76b1f0b0ca06652556e04fa3 (patch) | |
| tree | 64060a2d84ef06285de1f1a13008899dec16a2dc /fs/super.c | |
| parent | userns: Remove implicit MNT_NODEV fragility. (diff) | |
| download | linux-cc50a07a247e17db76b1f0b0ca06652556e04fa3.tar.xz 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 'fs/super.c')
| -rw-r--r-- | fs/super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/super.c b/fs/super.c index 25cdceed2ad3..37813bf479cf 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); |