From: John Ferlan <jferlan@redhat.com>
Date: Tue, 12 Feb 2019 02:48:53 +0000 (-0500)
Subject: storage: Invert retval logic in virStorageBackendSCSITriggerRescan
X-Git-Tag: v5.1.0-rc1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5028781621e47a90655de641a5ea35cbc952997f;p=thirdparty%2Flibvirt.git

storage: Invert retval logic in virStorageBackendSCSITriggerRescan

Rather than initialize to 0 and change to -1 on error, let's do the
normal operation of initializing to -1 and set to 0 on success.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 85a177865f..591bcb04e2 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -56,16 +56,14 @@ static int
 virStorageBackendSCSITriggerRescan(uint32_t host)
 {
     int fd = -1;
-    int retval = 0;
+    int retval = -1;
     char *path = NULL;
 
     VIR_DEBUG("Triggering rescan of host %d", host);
 
     if (virAsprintf(&path, "%s/host%u/scan",
-                    LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0) {
-        retval = -1;
+                    LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0)
         goto cleanup;
-    }
 
     VIR_DEBUG("Scan trigger path is '%s'", path);
 
@@ -75,7 +73,6 @@ virStorageBackendSCSITriggerRescan(uint32_t host)
         virReportSystemError(errno,
                              _("Could not open '%s' to trigger host scan"),
                              path);
-        retval = -1;
         goto cleanup;
     }
 
@@ -85,9 +82,11 @@ virStorageBackendSCSITriggerRescan(uint32_t host)
         virReportSystemError(errno,
                              _("Write to '%s' to trigger host scan failed"),
                              path);
-        retval = -1;
+        goto cleanup;
     }
 
+    retval = 0;
+
  cleanup:
     VIR_FORCE_CLOSE(fd);
     VIR_FREE(path);