Re: [libvirt] [PATCH 1/3] storage: Move the virStorageBackendFileSystem{Start|Stop} API's

Just moving code around with minor adjustment to have the Stop code combine with the Unmount code since all the Stop code did was call the Unmount code. Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/storage/storage_backend.c | 1 + src/storage/storage_backend_fs.c | 74 +++++++++++++++------------------------- 2 files changed, 29 insertions(+), 46 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 92b08a2..8291fd5 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -171,6 +171,7 @@ virStorageFileBackendForTypeInternal(int type, virStorageFileBackendPtr +

virStorageFileBackendForType(int type, int protocol) { diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 15b3599..67e36be 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -536,16 +536,43 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) return ret; } + /** + * @conn connection to report errors against + * @pool storage pool to start + * + * Starts a directory or FS based storage pool. The underlying source + * device will be mounted for FS based pools. + * + * Returns 0 on success, -1 on error + */ +static int +virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) +{ + if (pool->def->type != VIR_STORAGE_POOL_DIR && + virStorageBackendFileSystemMount(pool) < 0) + return -1; + + return 0; +} + + +/** + * @conn connection to report errors against * @pool storage pool to unmount * + * Stops a file storage pool. The underlying source device is unmounted + * for FS based pools. Any cached data about volumes is released. + * * Ensure that a FS storage pool is not mounted on its target location. * If already unmounted, this is a no-op. * * Returns 0 if successfully unmounted, -1 on error */ static int -virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool) +virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) { virCommandPtr cmd = NULL; int ret = -1; @@ -598,29 +625,6 @@ virStorageBackendFileSystemCheck(virStoragePoolObjPtr pool, return 0; } -#if WITH_STORAGE_FS -/** - * @conn connection to report errors against - * @pool storage pool to start - * - * Starts a directory or FS based storage pool. The underlying source - * device will be mounted for FS based pools. - * - * Returns 0 on success, -1 on error - */ -static int -virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) -{ - if (pool->def->type != VIR_STORAGE_POOL_DIR && - virStorageBackendFileSystemMount(pool) < 0) - return -1; - - return 0; -} -#endif /* WITH_STORAGE_FS */ - - /* some platforms don't support mkfs */ #ifdef MKFS static int @@ -948,28 +952,6 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, /** * @conn connection to report errors against - * @pool storage pool to stop - * - * Stops a file storage pool. The underlying source device is unmounted - * for FS based pools. Any cached data about volumes is released. - * - * Returns 0 on success, -1 on error. - */ -#if WITH_STORAGE_FS -static int -virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) -{ - if (virStorageBackendFileSystemUnmount(pool) < 0) - return -1; - - return 0; -} -#endif /* WITH_STORAGE_FS */ - - -/** - * @conn connection to report errors against * @pool storage pool to delete * * Delete a directory based storage pool