]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Revert "storage: For FS pool check for properly formatted target volume"
authorPeter Krempa <pkrempa@redhat.com>
Thu, 12 Jan 2017 12:50:19 +0000 (13:50 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 13 Jan 2017 08:28:28 +0000 (09:28 +0100)
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

index f4341f32cf8a88e4f7490dc82a02760a1f51dd9e..f0ef07b2fae724e03a9b13eab9ac6de9653de61a 100644 (file)
@@ -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;