From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Dec 2015 21:11:00 +0000 (-0500)
Subject: os/bluestore: simplify _do_remove
X-Git-Tag: v10.0.3~154^2~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e965db8e42a623d2f8c21e1f30bb2be6415f36a;p=ceph.git

os/bluestore: simplify _do_remove

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 5cf33180322..3af5ee21f4d 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;
 }