]> xenbits.xensource.com Git - libvirt.git/commitdiff
storage: Adjust command arglist for gluster
authorJohn Ferlan <jferlan@redhat.com>
Mon, 15 Jun 2015 21:20:32 +0000 (17:20 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 15 Jun 2015 21:25:47 +0000 (17:25 -0400)
In order for the glusterfs boolean to be set, the pool->def->type must be
VIR_STORAGE_POOL_NETFS, thus the check within virCommandNewArgList whether
pool->def->type is VIR_STORAGE_POOL_FS will never be true, so remove it

src/storage/storage_backend_fs.c

index 8487f08371ad850ac493c434d9f7e5961e6c04a9..d2cf470f48db98c8edf31c75d0c5718ab47043d4 100644 (file)
@@ -462,9 +462,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool)
     else if (glusterfs)
         cmd = virCommandNewArgList(MOUNT,
                                    "-t",
-                                   (pool->def->type == VIR_STORAGE_POOL_FS ?
-                                    virStoragePoolFormatFileSystemTypeToString(pool->def->source.format) :
-                                    virStoragePoolFormatFileSystemNetTypeToString(pool->def->source.format)),
+                                   virStoragePoolFormatFileSystemNetTypeToString(pool->def->source.format),
                                    src,
                                    "-o",
                                    "direct-io-mode=1",