storage: Remove unused attribute conn from 'checkPool' callback

In order to be able to use 'checkPool' inside functions which do not
have any connection reference, 'conn' attribute needs to be discarded
from the checkPool's signature, since it's not used by any storage backend
anyway.

diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h
index 9f1db605fbe42a727e93dd9ec6cf295cf38a0b7a..fd2451cf6ab1131b92b5e88b06e1fe2a148c20ac 100644 (file)
--- a/src/storage/storage_backend.h
+++ b/src/storage/storage_backend.h
@@ -34,8 +34,7 @@
 typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn,
                                                    const char *srcSpec,
                                                    unsigned int flags);
-typedef int (*virStorageBackendCheckPool)(virConnectPtr conn,
-                                          virStoragePoolObjPtr pool,
+typedef int (*virStorageBackendCheckPool)(virStoragePoolObjPtr pool,
                                           bool *active);
 typedef int (*virStorageBackendStartPool)(virConnectPtr conn,
                                           virStoragePoolObjPtr pool);

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 35385db84f431d3a4cf8d4ef737e1cb5668fcf2d..d4d65bcf2ea3dd8499bdeb310423707dcd7c0f38 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -533,8 +533,7 @@ virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool)
 
 
 static int
-virStorageBackendFileSystemCheck(virConnectPtr conn ATTRIBUTE_UNUSED,
-                                 virStoragePoolObjPtr pool,
+virStorageBackendFileSystemCheck(virStoragePoolObjPtr pool,
                                  bool *isActive)
 {
     if (pool->def->type == VIR_STORAGE_POOL_DIR) {

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index 079c767af45f4de24d3a7f5fe0dbbf08739bd171..497a71b66c44eb8a8a15a87b9fb811e7bf6b6c43 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -236,8 +236,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
 }
 
 static int
-virStorageBackendISCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
-                                virStoragePoolObjPtr pool,
+virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool,
                                 bool *isActive)
 {
     char *session = NULL;

diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index 7ba8ded55b04f354f085014513d6c41577f64d29..11c568388443f447a99aa900395982f24efbd2c0 100644 (file)
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -479,8 +479,7 @@ virStorageBackendLogicalFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
 
 
 static int
-virStorageBackendLogicalCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
-                                  virStoragePoolObjPtr pool,
+virStorageBackendLogicalCheckPool(virStoragePoolObjPtr pool,
                                   bool *isActive)
 {
     *isActive = virFileExists(pool->def->target.path);

diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 44bcd60ddf2ca77893546a336df3c7aa1aa9af56..971408a81722c7d7b5b579e1bc91dc481f2aaec1 100644 (file)
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -245,8 +245,7 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool)
 }
 
 static int
-virStorageBackendMpathCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
-                                virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
+virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
                                 bool *isActive)
 {
     *isActive = virFileExists("/dev/mpath");

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 58e7e6d0601b5801ddc28dcf90781b94099de4ea..66e0846cc6dfe615027b584b597ec3869a5314cf 100644 (file)
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -844,8 +844,7 @@ deleteVport(virConnectPtr conn,
 
 
 static int
-virStorageBackendSCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
-                               virStoragePoolObjPtr pool,
+virStorageBackendSCSICheckPool(virStoragePoolObjPtr pool,
                                bool *isActive)
 {
     char *path = NULL;

diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c
index 948270680c34dffe37acfc0c30c436bdc957eb32..cb2662a27e8798ca85de9c669fc6059567ba1d04 100644 (file)
--- a/src/storage/storage_backend_zfs.c
+++ b/src/storage/storage_backend_zfs.c
@@ -41,8 +41,7 @@ VIR_LOG_INIT("storage.storage_backend_zfs");
 
 
 static int
-virStorageBackendZFSCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
-                              virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
+virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
                               bool *isActive)
 {
     char *devpath;

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index b95506faf594afbd2db2d1bcdcc81041f20dcd70..64ea770d2387ffa51ba1b3b7349331afa2b29030 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -100,7 +100,7 @@ storageDriverAutostart(void)
         }
 
         if (backend->checkPool &&
-            backend->checkPool(conn, pool, &started) < 0) {
+            backend->checkPool(pool, &started) < 0) {
             virErrorPtr err = virGetLastError();
             VIR_ERROR(_("Failed to initialize storage pool '%s': %s"),
                       pool->def->name, err ? err->message :