提交 1edfce9b 编写于 作者: J John Ferlan

storage: Set ret = -1 on failures in virStorageBackendUpdateVolTargetInfo

While processing the volume for lseek, virFileReadHeaderFD, and
virStorageFileGetMetadataFromBuf - failure would cause an error,
but ret would not be set. That would result in an error message being
sent, but successful status being returned.
上级 af4028dc
...@@ -1625,16 +1625,19 @@ virStorageBackendUpdateVolTargetInfo(virStorageSourcePtr target, ...@@ -1625,16 +1625,19 @@ virStorageBackendUpdateVolTargetInfo(virStorageSourcePtr target,
if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
virReportSystemError(errno, _("cannot seek to start of '%s'"), target->path); virReportSystemError(errno, _("cannot seek to start of '%s'"), target->path);
ret = -1;
goto cleanup; goto cleanup;
} }
if ((len = virFileReadHeaderFD(fd, len, &buf)) < 0) { if ((len = virFileReadHeaderFD(fd, len, &buf)) < 0) {
virReportSystemError(errno, _("cannot read header '%s'"), target->path); virReportSystemError(errno, _("cannot read header '%s'"), target->path);
ret = -1;
goto cleanup; goto cleanup;
} }
if (!(meta = virStorageFileGetMetadataFromBuf(target->path, buf, len, target->format, if (!(meta = virStorageFileGetMetadataFromBuf(target->path, buf, len, target->format,
NULL))) { NULL))) {
ret = -1;
goto cleanup; goto cleanup;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册