From be45e54a99e158fa613f47c8cc248855208fae83 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Wed, 11 Sep 2019 04:52:38 -0400 Subject: [PATCH] lib/blob: simplify return path in serializing extent_rle This patch simplifies return path when returning from serialization of extent_rle. Both paths will share more code in upcoming patch. Signed-off-by: Tomasz Zawadzki Change-Id: Ibb0ebcfe4377fe09709345d580d54050b61d3c88 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468231 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/blob/blobstore.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index 147b59852..433e20a14 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -713,9 +713,8 @@ _spdk_blob_serialize_extent_rle(const struct spdk_blob *blob, if (buf_sz < cur_sz) { /* If we ran out of buffer space, return */ - desc_extent_rle->length = sizeof(desc_extent_rle->extents[0]) * extent_idx; *next_cluster = i; - return; + goto finish; } lba = blob->active.clusters[i]; @@ -726,9 +725,11 @@ _spdk_blob_serialize_extent_rle(const struct spdk_blob *blob, desc_extent_rle->extents[extent_idx].length = lba_count / lba_per_cluster; extent_idx++; - desc_extent_rle->length = sizeof(desc_extent_rle->extents[0]) * extent_idx; *next_cluster = blob->active.num_clusters; +finish: + desc_extent_rle->length = sizeof(desc_extent_rle->extents[0]) * extent_idx; + return; }