提交 f9efcd92 编写于 作者: J John Ferlan

iscsi: Fix exit path for virStorageBackendISCSIFindLUs failure

If the call to virStorageBackendISCSIGetHostNumber failed, we set
retval = -1, but yet still called virStorageBackendSCSIFindLUs.
Need to add a goto cleanup - while at it, adjust the logic to
initialize retval to -1 and only changed to 0 (zero) on success.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 d9ece065
......@@ -131,23 +131,27 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool,
const char *session)
{
char *sysfs_path;
int retval = 0;
int retval = -1;
uint32_t host;
if (virAsprintf(&sysfs_path,
"/sys/class/iscsi_session/session%s/device", session) < 0)
return -1;
goto cleanup;
if (virStorageBackendISCSIGetHostNumber(sysfs_path, &host) < 0) {
virReportSystemError(errno,
_("Failed to get host number for iSCSI session "
"with path '%s'"),
sysfs_path);
retval = -1;
goto cleanup;
}
if (virStorageBackendSCSIFindLUs(pool, host) < 0)
retval = -1;
goto cleanup;
retval = 0;
cleanup:
VIR_FREE(sysfs_path);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册