From: John Ferlan <jferlan@redhat.com>
Date: Wed, 14 Sep 2016 18:01:34 +0000 (-0400)
Subject: rbd: Change virStorageBackendRBDCloseRADOSConn to be static void
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=23671359f544da6651a7df504f870a15474b1350;p=libvirt.git

rbd: Change virStorageBackendRBDCloseRADOSConn to be static void

Since none of the callers check the status, let's just alter it to
a static void.

While we're at it - scrap the local runtime variable and just do the
math in the VIR_DEBUG directly.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 21693c416c..4e82232754 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -205,29 +205,23 @@ virStorageBackendRBDOpenIoCTX(virStorageBackendRBDStatePtr ptr,
     return r;
 }
 
-static int
+static void
 virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr)
 {
-    int ret = 0;
-
     if (ptr->ioctx != NULL) {
         VIR_DEBUG("Closing RADOS IoCTX");
         rados_ioctx_destroy(ptr->ioctx);
-        ret = -1;
     }
     ptr->ioctx = NULL;
 
     if (ptr->cluster != NULL) {
         VIR_DEBUG("Closing RADOS connection");
         rados_shutdown(ptr->cluster);
-        ret = -2;
     }
     ptr->cluster = NULL;
 
-    time_t runtime = time(0) - ptr->starttime;
-    VIR_DEBUG("RADOS connection existed for %ld seconds", runtime);
-
-    return ret;
+    VIR_DEBUG("RADOS connection existed for %ld seconds",
+              time(0) - ptr->starttime);
 }
 
 static int