From ebf81e3039eae29cbe6919447a1ccfa5ba0f13ee Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 18 Oct 2016 13:50:17 +0000 Subject: [PATCH] os/bluestore: proper set resulting pnext to avoid returning local var Signed-off-by: Igor Fedotov --- src/os/bluestore/BlueStore.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 26b349012652..625b7f961a31 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5459,7 +5459,6 @@ int BlueStore::_collection_list( if (start == ghobject_t::get_max() || start.hobj.is_max()) { - *pnext = ghobject_t::get_max(); goto out; } get_coll_key_range(c->cid, c->cnode.bits, &temp_start_key, &temp_end_key, @@ -5541,11 +5540,11 @@ int BlueStore::_collection_list( ls->push_back(oid); it->next(); } +out: if (!set_next) { *pnext = ghobject_t::get_max(); } -out: return r; } -- 2.47.3