mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
storage: return -1 when fs pool can't be mounted
Don't reuse the return value of virStorageBackendFileSystemIsMounted. If it's 0, we'd return it even if the mount command failed. Also, don't report another error if it's -1, since one has already been reported. Introduced by258e06c
. https://bugzilla.redhat.com/show_bug.cgi?id=981251 (cherry picked from commit13fde7ceab
)
This commit is contained in:
parent
d145c8300f
commit
a710962d86
@ -352,6 +352,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) {
|
||||
pool->def->source.format == VIR_STORAGE_POOL_NETFS_GLUSTERFS);
|
||||
virCommandPtr cmd = NULL;
|
||||
int ret = -1;
|
||||
int rc;
|
||||
|
||||
if (pool->def->type == VIR_STORAGE_POOL_NETFS) {
|
||||
if (pool->def->source.nhost != 1) {
|
||||
@ -378,10 +379,12 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) {
|
||||
}
|
||||
|
||||
/* Short-circuit if already mounted */
|
||||
if ((ret = virStorageBackendFileSystemIsMounted(pool)) != 0) {
|
||||
if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 0) {
|
||||
if (rc == 1) {
|
||||
virReportError(VIR_ERR_OPERATION_INVALID,
|
||||
_("Target '%s' is already mounted"),
|
||||
pool->def->target.path);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user