NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Rename UpdateVolInfoFlags to UpdateVolInfo

Browse Source 
And drop the original UpdateVolInfo. Makes it a bit easier to follow
the function usage.

And change the int parameter to an explicit bool.
This commit is contained in:
Cole Robinson 2014-03-30 18:27:14 -04:00
parent 968aae48c9
commit 16d75d19fc
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/storage_backend.c
View File

@ -1338,9 +1338,9 @@ virStorageBackendUpdateVolTargetInfo(virStorageVolTargetPtr target,
} }
int int
virStorageBackendUpdateVolInfoFlags(virStorageVolDefPtr vol, virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol,
int withCapacity, bool withCapacity,
unsigned int openflags) unsigned int openflags)
{ {
int ret; int ret;
@ -1359,13 +1359,6 @@ virStorageBackendUpdateVolInfoFlags(virStorageVolDefPtr vol,
return 0; return 0;
} }
int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol,
int withCapacity)
{
return virStorageBackendUpdateVolInfoFlags(vol, withCapacity,
VIR_STORAGE_VOL_OPEN_DEFAULT);
}
/* /*
* virStorageBackendUpdateVolTargetInfoFD: * virStorageBackendUpdateVolTargetInfoFD:
* @target: target definition ptr of volume to update * @target: target definition ptr of volume to update

6
src/storage/storage_backend.h
View File

@ -138,10 +138,8 @@ int virStorageBackendVolOpenCheckMode(const char *path, struct stat *sb,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, int virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol,
int withCapacity); bool withCapacity,
int virStorageBackendUpdateVolInfoFlags(virStorageVolDefPtr vol, unsigned int openflags);
int withCapacity,
unsigned int openflags);
int virStorageBackendUpdateVolTargetInfo(virStorageVolTargetPtr target, int virStorageBackendUpdateVolTargetInfo(virStorageVolTargetPtr target,
unsigned long long *allocation, unsigned long long *allocation,
unsigned long long *capacity, unsigned long long *capacity,

3
src/storage/storage_backend_disk.c
View File

@ -113,7 +113,8 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool,
} }
/* Refresh allocation/capacity/perms */ /* Refresh allocation/capacity/perms */
if (virStorageBackendUpdateVolInfo(vol, 1) < 0) if (virStorageBackendUpdateVolInfo(vol, true,
VIR_STORAGE_VOL_OPEN_DEFAULT) < 0)
return -1; return -1;
/* set partition type */ /* set partition type */

4
src/storage/storage_backend_fs.c
View File

@ -1180,8 +1180,8 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn,
int ret; int ret;
/* Refresh allocation / permissions info in case its changed */ /* Refresh allocation / permissions info in case its changed */
ret = virStorageBackendUpdateVolInfoFlags(vol, 0, ret = virStorageBackendUpdateVolInfo(vol, false,
VIR_STORAGE_VOL_FS_OPEN_FLAGS); VIR_STORAGE_VOL_FS_OPEN_FLAGS);
if (ret < 0) if (ret < 0)
return ret; return ret;

3
src/storage/storage_backend_logical.c
View File

@ -149,7 +149,8 @@ virStorageBackendLogicalMakeVol(char **const groups,
if (!vol->key && VIR_STRDUP(vol->key, groups[2]) < 0) if (!vol->key && VIR_STRDUP(vol->key, groups[2]) < 0)
goto cleanup; goto cleanup;
if (virStorageBackendUpdateVolInfo(vol, 1) < 0) if (virStorageBackendUpdateVolInfo(vol, true,
VIR_STORAGE_VOL_OPEN_DEFAULT) < 0)
goto cleanup; goto cleanup;
nextents = 1; nextents = 1;