From 257250f764373f1650b675c6b249451acb6eb8d9 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Mon, 15 Jun 2015 17:20:32 -0400 Subject: [PATCH] storage: Adjust command arglist for gluster 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 8487f08371..d2cf470f48 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -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",