diff --git a/ChangeLog b/ChangeLog index 39626a58a1..f1f249bf3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue May 12 15:58:28 EDT 2009 Cole Robinson + + * src/storage_backend.c: Document a function + * src/storage_backend_fs.c: Don't squash file probe errors. + Tue May 12 17:45:22 BST 2009 Daniel P. Berrange * .hgignore, tests/.cvsignore, tests/.gitignore: Ignore diff --git a/src/storage_backend.c b/src/storage_backend.c index b1541407a9..2db314dfab 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -156,6 +156,17 @@ virStorageBackendUpdateVolInfo(virConnectPtr conn, return 0; } +/* + * virStorageBackendUpdateVolTargetInfoFD: + * @conn: connection to report errors on + * @target: target definition ptr of volume to update + * @fd: fd of storage volume to update + * @allocation: If not NULL, updated allocation information will be stored + * @capacity: If not NULL, updated capacity info will be stored + * + * Returns 0 for success-1 on a legitimate error condition, + * -2 if passed FD isn't a regular, char, or block file. + */ int virStorageBackendUpdateVolTargetInfoFD(virConnectPtr conn, virStorageVolTargetPtr target, diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 92ff3cb408..d64b64d2fd 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -843,7 +843,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, &vol->allocation, &vol->capacity) < 0)) { if (ret == -1) - goto no_memory; + goto cleanup; else { /* Silently ignore non-regular files, * eg '.' '..', 'lost+found' */ @@ -883,7 +883,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, &vol->backingStore, NULL, NULL, NULL)) < 0) { if (ret == -1) - goto no_memory; + goto cleanup; else { /* Silently ignore non-regular files, * eg '.' '..', 'lost+found' */