Commit 542c45ac authored by Andrew Wellington's avatar Andrew Wellington Committed by Greg Kroah-Hartman

staging: lustre: llite: support SELinux context labelling

SELinux contexts are applied by the kernel if mount options are
not binary. As we don't use any binary mount options in Lustre,
remove the binary mount option flag.
Signed-off-by: default avatarAndrew Wellington <andrew.wellington@anu.edu.au>
Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6950
Reviewed-on: http://review.whamcloud.com/15840Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarSebastien Buisson <sebastien.buisson@bull.net>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1fb26939
...@@ -717,6 +717,18 @@ static int ll_options(char *options, int *flags) ...@@ -717,6 +717,18 @@ static int ll_options(char *options, int *flags)
*flags &= ~tmp; *flags &= ~tmp;
goto next; goto next;
} }
tmp = ll_set_opt("context", s1, 1);
if (tmp)
goto next;
tmp = ll_set_opt("fscontext", s1, 1);
if (tmp)
goto next;
tmp = ll_set_opt("defcontext", s1, 1);
if (tmp)
goto next;
tmp = ll_set_opt("rootcontext", s1, 1);
if (tmp)
goto next;
tmp = ll_set_opt("user_fid2path", s1, LL_SBI_USER_FID2PATH); tmp = ll_set_opt("user_fid2path", s1, LL_SBI_USER_FID2PATH);
if (tmp) { if (tmp) {
*flags |= tmp; *flags |= tmp;
......
...@@ -1216,8 +1216,7 @@ static struct file_system_type lustre_fs_type = { ...@@ -1216,8 +1216,7 @@ static struct file_system_type lustre_fs_type = {
.name = "lustre", .name = "lustre",
.mount = lustre_mount, .mount = lustre_mount,
.kill_sb = lustre_kill_super, .kill_sb = lustre_kill_super,
.fs_flags = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV | .fs_flags = FS_REQUIRES_DEV | FS_RENAME_DOES_D_MOVE,
FS_RENAME_DOES_D_MOVE,
}; };
MODULE_ALIAS_FS("lustre"); MODULE_ALIAS_FS("lustre");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment