From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 10 Sep 2015 11:29:36 +0000 (+0200)
Subject: virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=370461d1dbcdcf63fbe6c34d188c28cf11488845;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType

The check is done in virSecuritySELinuxSetFilecon itself. There's
no need to check it again.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index d2e5aa206..46080bfb3 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -2306,7 +2306,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
             continue;
         }
         if (virSecuritySELinuxSetSecurityDiskLabel(mgr,
-                                         def, def->disks[i]) < 0)
+                                                   def, def->disks[i]) < 0)
             return -1;
     }
     /* XXX fixme process  def->fss if relabel == true */
@@ -2355,11 +2355,9 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
         virSecuritySELinuxSetFilecon(def->os.dtb, data->content_context) < 0)
         return -1;
 
-    if (stdin_path) {
-        if (virSecuritySELinuxSetFilecon(stdin_path, data->content_context) < 0 &&
-            virFileIsSharedFSType(stdin_path, VIR_FILE_SHFS_NFS) != 1)
-            return -1;
-    }
+    if (stdin_path &&
+        virSecuritySELinuxSetFilecon(stdin_path, data->content_context) < 0)
+        return -1;
 
     return 0;
 }