From: Osier Yang <jyang@redhat.com>
Date: Wed, 27 Jun 2012 14:02:23 +0000 (+0800)
Subject: storage: Error out if the target is already mounted for netfs pool
X-Git-Tag: v0.9.13~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81165294;p=thirdparty%2Flibvirt.git

storage: Error out if the target is already mounted for netfs pool

mnt_fsname can not be the same, as we check the duplicate pool
sources earlier before, means it can't be the same pool, moreover,
a pool can't be started if it's already active anyway. So no reason
to act as success.
---

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index bde4528483..87d9192967 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -424,10 +424,10 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) {
 
     /* Short-circuit if already mounted */
     if ((ret = virStorageBackendFileSystemIsMounted(pool)) != 0) {
-        if (ret < 0)
-            return -1;
-        else
-            return 0;
+        virStorageReportError(VIR_ERR_OPERATION_INVALID,
+                              _("Target '%s' is already mounted"),
+                              pool->def->target.path);
+        return -1;
     }
 
     if (pool->def->type == VIR_STORAGE_POOL_NETFS) {