From 5f947da76ba6cf5855fe8fbe5d8f8b64fb7c45ec Mon Sep 17 00:00:00 2001 From: Piotr Pelplinski Date: Mon, 29 Jan 2018 10:25:44 +0100 Subject: [PATCH] blobstore: move free xattr's to separate function Signed-off-by: Piotr Pelplinski Change-Id: I8b570802b05b8e03802d3c2b68a1e7644ea548ac Reviewed-on: https://review.gerrithub.io/396572 Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Ben Walker --- lib/blob/blobstore.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index f853cb01f..64b0d60c1 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -166,10 +166,21 @@ _spdk_blob_alloc(struct spdk_blob_store *bs, spdk_blob_id id) } static void -_spdk_blob_free(struct spdk_blob_data *blob) +_spdk_xattrs_free(struct spdk_xattr_tailq *xattrs) { struct spdk_xattr *xattr, *xattr_tmp; + TAILQ_FOREACH_SAFE(xattr, xattrs, link, xattr_tmp) { + TAILQ_REMOVE(xattrs, xattr, link); + free(xattr->name); + free(xattr->value); + free(xattr); + } +} + +static void +_spdk_blob_free(struct spdk_blob_data *blob) +{ assert(blob != NULL); free(blob->active.clusters); @@ -177,12 +188,7 @@ _spdk_blob_free(struct spdk_blob_data *blob) free(blob->active.pages); free(blob->clean.pages); - TAILQ_FOREACH_SAFE(xattr, &blob->xattrs, link, xattr_tmp) { - TAILQ_REMOVE(&blob->xattrs, xattr, link); - free(xattr->name); - free(xattr->value); - free(xattr); - } + _spdk_xattrs_free(&blob->xattrs); free(blob); }