From 8e965db8e42a623d2f8c21e1f30bb2be6415f36a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 22 Dec 2015 16:11:00 -0500 Subject: [PATCH] os/bluestore: simplify _do_remove Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 5cf33180322bd..3af5ee21f4df9 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5470,16 +5470,13 @@ int BlueStore::_do_remove( CollectionRef& c, OnodeRef o) { - string key; _do_truncate(txc, c, o, 0); - o->exists = false; if (o->onode.omap_head) { _do_omap_clear(txc, o->onode.omap_head); } o->exists = false; txc->onodes.erase(o); - get_object_key(o->oid, &key); - txc->t->rmkey(PREFIX_OBJ, key); + txc->t->rmkey(PREFIX_OBJ, o->key); return 0; } -- 2.39.5