staging: lustre: llite: support SELinux context labelling
authorAndrew Wellington <andrew.wellington@anu.edu.au>
Thu, 10 Nov 2016 17:30:46 +0000 (12:30 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Nov 2016 15:02:55 +0000 (16:02 +0100)
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>
drivers/staging/lustre/lustre/llite/llite_lib.c
drivers/staging/lustre/lustre/obdclass/obd_mount.c

index 308da0660285768ba503fe57a89db88838bac3d1..62d9fcfded15e44290464fab602796253d53cc85 100644 (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;
index 59fbc29aae943e7841127cc3b1456fc848e835d0..f604824fdc7c734f37e5097770f0d622225140d4 100644 (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");