iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: lustre: llite: support SELinux context labelling

Browse Source 
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: Andrew Wellington <andrew.wellington@anu.edu.au>
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6950
Reviewed-on: http://review.whamcloud.com/15840
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Sebastien Buisson <sebastien.buisson@bull.net>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrew Wellington 2016-11-10 12:30:46 -05:00 committed by Greg Kroah-Hartman
parent 1fb26939dc
commit 542c45acfe
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/lustre/lustre/llite/llite_lib.c
View File

@ -717,6 +717,18 @@ static int ll_options(char *options, int *flags)
*flags &= ~tmp;
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);
if (tmp) {
*flags |= tmp;

3
drivers/staging/lustre/lustre/obdclass/obd_mount.c
View File

@ -1216,8 +1216,7 @@ static struct file_system_type lustre_fs_type = {
.name = "lustre",
.mount = lustre_mount,
.kill_sb = lustre_kill_super,
.fs_flags = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV |
FS_RENAME_DOES_D_MOVE,
.fs_flags = FS_REQUIRES_DEV | FS_RENAME_DOES_D_MOVE,
};
MODULE_ALIAS_FS("lustre");