[libvirt] [PATCH 0/2] Trivial fixes for 1.2.1
Peter Krempa (2): storage: Break long lines and clean up spaces in storage backend header storage: FS: Tweak some comments and fix typo src/storage/storage_backend.h | 56 ++++++++++++++++++++++++++-------------- src/storage/storage_backend_fs.c | 21 ++++++++------- 2 files changed, 48 insertions(+), 29 deletions(-) -- 1.8.5.2
--- src/storage/storage_backend.h | 56 ++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 9e07dd8..378bc4d 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -1,7 +1,7 @@ /* * storage_backend.h: internal storage driver backend contract * - * Copyright (C) 2007-2010, 2012-2013 Red Hat, Inc. + * Copyright (C) 2007-2010, 2012-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -30,22 +30,42 @@ # include "storage_conf.h" # include "vircommand.h" -typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn, const char *srcSpec, unsigned int flags); -typedef int (*virStorageBackendCheckPool)(virConnectPtr conn, virStoragePoolObjPtr pool, bool *active); -typedef int (*virStorageBackendStartPool)(virConnectPtr conn, virStoragePoolObjPtr pool); -typedef int (*virStorageBackendBuildPool)(virConnectPtr conn, virStoragePoolObjPtr pool, unsigned int flags); -typedef int (*virStorageBackendRefreshPool)(virConnectPtr conn, virStoragePoolObjPtr pool); -typedef int (*virStorageBackendStopPool)(virConnectPtr conn, virStoragePoolObjPtr pool); -typedef int (*virStorageBackendDeletePool)(virConnectPtr conn, virStoragePoolObjPtr pool, unsigned int flags); - +typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn, + const char *srcSpec, + unsigned int flags); +typedef int (*virStorageBackendCheckPool)(virConnectPtr conn, + virStoragePoolObjPtr pool, + bool *active); +typedef int (*virStorageBackendStartPool)(virConnectPtr conn, + virStoragePoolObjPtr pool); +typedef int (*virStorageBackendBuildPool)(virConnectPtr conn, + virStoragePoolObjPtr pool, + unsigned int flags); +typedef int (*virStorageBackendRefreshPool)(virConnectPtr conn, + virStoragePoolObjPtr pool); +typedef int (*virStorageBackendStopPool)(virConnectPtr conn, + virStoragePoolObjPtr pool); +typedef int (*virStorageBackendDeletePool)(virConnectPtr conn, + virStoragePoolObjPtr pool, + unsigned int flags); typedef int (*virStorageBackendBuildVol)(virConnectPtr conn, - virStoragePoolObjPtr pool, virStorageVolDefPtr vol, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, unsigned int flags); -typedef int (*virStorageBackendCreateVol)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol); -typedef int (*virStorageBackendRefreshVol)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol); -typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags); -typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, virStoragePoolObjPtr pool, - virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, +typedef int (*virStorageBackendCreateVol)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol); +typedef int (*virStorageBackendRefreshVol)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol); +typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int flags); +typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr origvol, + virStorageVolDefPtr newvol, unsigned int flags); typedef int (*virStorageBackendVolumeResize)(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -119,7 +139,6 @@ int virStorageBackendVolOpenCheckMode(const char *path, struct stat *sb, int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, int withCapacity); - int virStorageBackendUpdateVolInfoFlags(virStorageVolDefPtr vol, int withCapacity, unsigned int openflags); @@ -132,9 +151,8 @@ int virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, struct stat *sb, unsigned long long *allocation, unsigned long long *capacity); -int -virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target, - int fd); +int virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target, + int fd); char *virStorageBackendStablePath(virStoragePoolObjPtr pool, const char *devpath, -- 1.8.5.2
On 01/10/14 12:09, Peter Krempa wrote:
--- src/storage/storage_backend.h | 56 ++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 19 deletions(-)
I've pushed this one as trivial. Peter
--- src/storage/storage_backend_fs.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 6ebdd46..dad7b53 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1,7 +1,7 @@ /* * storage_backend_fs.c: storage backend for FS and directory handling * - * Copyright (C) 2007-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -460,7 +460,7 @@ cleanup: * @pool storage pool to unmount * * Ensure that a FS storage pool is not mounted on its target location. - * If already unmounted, this is a no-op + * If already unmounted, this is a no-op. * * Returns 0 if successfully unmounted, -1 on error */ @@ -540,9 +540,8 @@ virStorageBackendFileSystemCheck(virConnectPtr conn ATTRIBUTE_UNUSED, * @conn connection to report errors against * @pool storage pool to start * - * Starts a directory or FS based storage pool. - * - * - If it is a FS based pool, mounts the unlying source device on the pool + * Starts a directory or FS based storage pool. If the pool it is a FS based + * pool the underlying source device is mounted. * * Returns 0 on success, -1 on error */ @@ -739,7 +738,8 @@ error: * VIR_STORAGE_POOL_BUILD_OVERWRITE is set, mkfs is always executed, * any existed data on the target device is overwritten unconditionally. * - * - If it is a FS based pool, mounts the unlying source device on the pool + * If the pool is a FS based pool, the function mounts the underlying source + * device. * * Returns 0 on success, -1 on error */ @@ -940,12 +940,13 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, /** * @conn connection to report errors against - * @pool storage pool to start + * @pool storage pool to stop * - * Stops a FS based storage pool. + * Stops a FS based storage pool. If it is a FS based pool, unmounts the + * underlying source device on the pool. All cached data about volumes is + * released. * - * - If it is a FS based pool, unmounts the unlying source device on the pool - * - Releases all cached data about volumes + * Returns 0 on success, -1 on error. */ #if WITH_STORAGE_FS static int -- 1.8.5.2
On Fri, Jan 10, 2014 at 12:09:49PM +0100, Peter Krempa wrote:
--- src/storage/storage_backend_fs.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
I'd reword some of those probably, but this patch is supposed to be merely a formatting cleanup, I guess. So ACK. Martin
participants (2)
-
Martin Kletzander -
Peter Krempa