| From 315706837bdb6f11c0bb4b48612d35afa1965454 Mon Sep 17 00:00:00 2001 |
| Message-Id: <315706837bdb6f11c0bb4b48612d35afa1965454@dist-git> |
| From: Peter Krempa <pkrempa@redhat.com> |
| Date: Fri, 28 Feb 2020 10:24:39 +0100 |
| Subject: [PATCH] virStorageBackendGlusterRefreshVol: Refactor handling of |
| backing store |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Take the format of the backing store from the 'meta' object directly and |
| use g_steal_pointer to steal the path. |
| |
| Signed-off-by: Peter Krempa <pkrempa@redhat.com> |
| Reviewed-by: Ján Tomko <jtomko@redhat.com> |
| (cherry picked from commit fee56942e2dacc64ed4b36aa2ea887f60c117659) |
| |
| https://bugzilla.redhat.com/show_bug.cgi?id=1798148 |
| Message-Id: <8bf19c252bd0a49ef7e689c809314345d7831735.1582881363.git.pkrempa@redhat.com> |
| Reviewed-by: Ján Tomko <jtomko@redhat.com> |
| |
| src/storage/storage_backend_gluster.c | 11 ++++------- |
| 1 file changed, 4 insertions(+), 7 deletions(-) |
| |
| diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c |
| index 4a8ee3870d..e92e9612bd 100644 |
| |
| |
| @@ -224,7 +224,6 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, |
| int ret = -1; |
| glfs_fd_t *fd = NULL; |
| ssize_t len; |
| - int backingFormat; |
| g_autoptr(virStorageVolDef) vol = NULL; |
| g_autoptr(virStorageSource) meta = NULL; |
| g_autofree char *header = NULL; |
| @@ -277,7 +276,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, |
| |
| if (!(meta = virStorageFileGetMetadataFromBuf(name, header, len, |
| VIR_STORAGE_FILE_AUTO, |
| - &backingFormat))) |
| + NULL))) |
| goto cleanup; |
| |
| if (meta->backingStoreRaw) { |
| @@ -286,13 +285,11 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, |
| |
| vol->target.backingStore->type = VIR_STORAGE_TYPE_NETWORK; |
| |
| - vol->target.backingStore->path = meta->backingStoreRaw; |
| + vol->target.backingStore->path = g_steal_pointer(&meta->backingStoreRaw); |
| + vol->target.backingStore->format = meta->backingStoreRawFormat; |
| |
| - if (backingFormat < 0) |
| + if (vol->target.backingStore->format < 0) |
| vol->target.backingStore->format = VIR_STORAGE_FILE_RAW; |
| - else |
| - vol->target.backingStore->format = backingFormat; |
| - meta->backingStoreRaw = NULL; |
| } |
| |
| vol->target.format = meta->format; |
| -- |
| 2.25.1 |
| |