From: Yi Li <yili@winhong.com>
Date: Wed, 23 Sep 2020 03:34:57 +0000 (+0800)
Subject: Remove redundant check when storage pool is mounted
X-Git-Tag: v6.8.0-rc1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ac453e4931829b778f15098df60a3146f84795f;p=thirdparty%2Flibvirt.git

Remove redundant check when storage pool is mounted

virFileComparePaths just return 0 or 1 after commit 7b48bb8
so break while after virFileComparePaths return 1

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Yi Li <yili@winhong.com>
---

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 536e5cf952..30c2367df4 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -245,7 +245,6 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool)
     FILE *mtab;
     struct mntent ent;
     char buf[1024];
-    int rc1, rc2;
     g_autofree char *src = NULL;
 
     if ((mtab = fopen(_PATH_MOUNTED, "r")) == NULL) {
@@ -262,11 +261,8 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool)
         /* compare both mount destinations and sources to be sure the mounted
          * FS pool is really the one we're looking for
          */
-        if ((rc1 = virFileComparePaths(ent.mnt_dir, def->target.path)) < 0 ||
-            (rc2 = virFileComparePaths(ent.mnt_fsname, src)) < 0)
-            goto cleanup;
-
-        if (rc1 && rc2) {
+        if (virFileComparePaths(ent.mnt_dir, def->target.path) &&
+            virFileComparePaths(ent.mnt_fsname, src)) {
             ret = 1;
             goto cleanup;
         }
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 61d2c16072..e120d277d0 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -3884,7 +3884,6 @@ virFileCopyACLs(const char *src,
  * Returns:
  *  1 : Equal
  *  0 : Non-Equal
- * -1 : Error
  */
 int
 virFileComparePaths(const char *p1, const char *p2)