aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/super.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c
index d571527cb8b8..1f75fe312597 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -1275,10 +1275,16 @@ mount_fs(struct file_system_type *type, int flags, const char *name, void *data)
smp_wmb();
sb->s_flags |= SB_BORN;
- error = security_sb_kern_mount(sb, flags, &opts);
+ error = security_sb_set_mnt_opts(sb, &opts, 0, NULL);
if (error)
goto out_sb;
+ if (!(flags & MS_KERNMOUNT)) {
+ error = security_sb_kern_mount(sb);
+ if (error)
+ goto out_sb;
+ }
+
/*
* filesystems should never set s_maxbytes larger than MAX_LFS_FILESIZE
* but s_maxbytes was an unsigned long long for many releases. Throw