From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Jan 2016 19:22:28 +0000 (-0500)
Subject: Revert "kstore: fix nid overwritten of write/zero"
X-Git-Tag: v10.0.4~101^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=493afb465fe92f1c1bbae0b7b553bd67f1a4a40b;p=ceph.git

Revert "kstore: fix nid overwritten of write/zero"

This reverts commit 8065b8ab34f06d8d5d8e7fbdc1d8a846d88b30df.

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

diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index 712a02fc47e3..17f0ab778431 100644
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -2986,11 +2986,8 @@ int KStore::_write(TransContext *txc,
 	   << " " << offset << "~" << length
 	   << dendl;
   RWLock::WLocker l(c->lock);
-  OnodeRef o = c->get_onode(oid, false);
-  if (!o) {
-    o = c->get_onode(oid, true);
-    _assign_nid(txc, o);
-  }
+  OnodeRef o = c->get_onode(oid, true);
+  _assign_nid(txc, o);
   int r = _do_write(txc, o, offset, length, bl, fadvise_flags);
   txc->write_onode(o);
 
@@ -3011,11 +3008,8 @@ int KStore::_zero(TransContext *txc,
   int r = 0;
 
   RWLock::WLocker l(c->lock);
-  OnodeRef o = c->get_onode(oid, false);
-  if (!o) {
-    o = c->get_onode(oid, true);
-    _assign_nid(txc, o);
-  }
+  OnodeRef o = c->get_onode(oid, true);
+  _assign_nid(txc, o);
 
   uint64_t stripe_size = o->onode.stripe_size;
   if (stripe_size) {