[libvirt] [PATCH 1/3] Revert "storage: For FS pool check for properly formatted target volume"

Peter Krempa pkrempa at redhat.com
Thu Jan 12 14:24:08 UTC 2017


The check does not work properly (crashes) with netfs filesystems and
also checking that a device is not empty when attempting to mount a
filesystem is not very usefull since the mount will fail anyways.

As the code would improve only a very minor corner case I don't really
see a reason to have this code at all.

This code would also fail if libvirt is compiled without support for
blkid and without parted.

This reverts commit a11fd69735e6951cda9bf256d8e423696a441aa4.
---
 src/storage/storage_backend_fs.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index f4341f32c..f0ef07b2f 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -605,17 +605,8 @@ static int
 virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED,
                                  virStoragePoolObjPtr pool)
 {
-    const char *format =
-        virStoragePoolFormatFileSystemTypeToString(pool->def->source.format);
-    const char *path = pool->def->source.devices[0].path;
-
-    if (pool->def->type == VIR_STORAGE_POOL_DIR)
-        return 0;
-
-    if (!virStorageBackendDeviceIsEmpty(path, format, false))
-        return -1;
-
-    if (virStorageBackendFileSystemMount(pool) < 0)
+    if (pool->def->type != VIR_STORAGE_POOL_DIR &&
+        virStorageBackendFileSystemMount(pool) < 0)
         return -1;

     return 0;
-- 
2.11.0




More information about the libvir-list mailing list