External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

scsi: Change return values for virStorageBackendSCSIFindLUs

Browse Source 
Rather than passing/returning a pointer to a boolean to indicate that
perhaps we should try again - adjust the return of the call to return
the count of LU's found during processing, then let the caller decide
what to do with that value.
This commit is contained in:
John Ferlan 2015-04-16 21:22:35 -04:00
parent adb182fa2f
commit 1e13eff435
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/storage/storage_backend_scsi.c
View File

@ -434,10 +434,9 @@ processLU(virStoragePoolObjPtr pool,
} }
static int int
virStorageBackendSCSIFindLUsInternal(virStoragePoolObjPtr pool, virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
uint32_t scanhost, uint32_t scanhost)
bool *found)
{ {
int retval = 0; int retval = 0;
uint32_t bus, target, lun; uint32_t bus, target, lun;
@ -445,6 +444,7 @@ virStorageBackendSCSIFindLUsInternal(virStoragePoolObjPtr pool,
DIR *devicedir = NULL; DIR *devicedir = NULL;
struct dirent *lun_dirent = NULL; struct dirent *lun_dirent = NULL;
char devicepattern[64]; char devicepattern[64];
int found = 0;
VIR_DEBUG("Discovering LUs on host %u", scanhost); VIR_DEBUG("Discovering LUs on host %u", scanhost);
@ -460,7 +460,6 @@ virStorageBackendSCSIFindLUsInternal(virStoragePoolObjPtr pool,
snprintf(devicepattern, sizeof(devicepattern), "%u:%%u:%%u:%%u\n", scanhost); snprintf(devicepattern, sizeof(devicepattern), "%u:%%u:%%u:%%u\n", scanhost);
*found = false;
while ((retval = virDirRead(devicedir, &lun_dirent, device_path)) > 0) { while ((retval = virDirRead(devicedir, &lun_dirent, device_path)) > 0) {
if (sscanf(lun_dirent->d_name, devicepattern, if (sscanf(lun_dirent->d_name, devicepattern,
&bus, &target, &lun) != 3) { &bus, &target, &lun) != 3) {
@ -470,24 +469,19 @@ virStorageBackendSCSIFindLUsInternal(virStoragePoolObjPtr pool,
VIR_DEBUG("Found possible LU '%s'", lun_dirent->d_name); VIR_DEBUG("Found possible LU '%s'", lun_dirent->d_name);
if (processLU(pool, scanhost, bus, target, lun) == 0) if (processLU(pool, scanhost, bus, target, lun) == 0)
*found = true; found++;
} }
if (!*found)
VIR_DEBUG("No LU found for pool %s", pool->def->name);
closedir(devicedir); closedir(devicedir);
return retval; if (retval < 0)
return -1;
VIR_DEBUG("Found %d LUs for pool %s", found, pool->def->name);
return found;
} }
int
virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool,
uint32_t scanhost)
{
bool found; /* This path doesn't care whether found or not */
return virStorageBackendSCSIFindLUsInternal(pool, scanhost, &found);
}
static int static int
virStorageBackendSCSITriggerRescan(uint32_t host) virStorageBackendSCSITriggerRescan(uint32_t host)
@ -575,7 +569,7 @@ virStoragePoolFCRefreshThread(void *opaque)
const char *name = cbdata->name; const char *name = cbdata->name;
virStoragePoolObjPtr pool = cbdata->pool; virStoragePoolObjPtr pool = cbdata->pool;
unsigned int host; unsigned int host;
bool found = false; int found;
int tries = 2; int tries = 2;
do { do {
@ -591,7 +585,7 @@ virStoragePoolFCRefreshThread(void *opaque)
virGetSCSIHostNumber(name, &host) == 0 && virGetSCSIHostNumber(name, &host) == 0 &&
virStorageBackendSCSITriggerRescan(host) == 0) { virStorageBackendSCSITriggerRescan(host) == 0) {
virStoragePoolObjClearVols(pool); virStoragePoolObjClearVols(pool);
virStorageBackendSCSIFindLUsInternal(pool, host, &found); found = virStorageBackendSCSIFindLUs(pool, host);
} }
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
} while (!found && --tries); } while (!found && --tries);
@ -914,7 +908,7 @@ virStorageBackendSCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
if (virStorageBackendSCSITriggerRescan(host) < 0) if (virStorageBackendSCSITriggerRescan(host) < 0)
goto out; goto out;
virStorageBackendSCSIFindLUs(pool, host); ignore_value(virStorageBackendSCSIFindLUs(pool, host));
ret = 0; ret = 0;
out: out: