From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 26 Sep 2016 03:00:41 +0000 (+0800)
Subject: os/bluestore: move nid assignment into BlueStore::_zero()
X-Git-Tag: v11.0.1~75^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5dd191d03df33c02c6e1e6b28043d1f782dba73;p=ceph.git

os/bluestore: move nid assignment into BlueStore::_zero()

So other callers, such as BlueStore::_clone_range(),
won't do it twice.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 627ee25fdc8d..c70ef8cd8a7a 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7581,6 +7581,8 @@ int BlueStore::_zero(TransContext *txc,
   dout(15) << __func__ << " " << c->cid << " " << o->oid
 	   << " 0x" << std::hex << offset << "~" << length << std::dec
 	   << dendl;
+  o->exists = true;
+  _assign_nid(txc, o);
   int r = _do_zero(txc, c, o, offset, length);
   dout(10) << __func__ << " " << c->cid << " " << o->oid
 	   << " 0x" << std::hex << offset << "~" << length << std::dec
@@ -7597,8 +7599,6 @@ int BlueStore::_do_zero(TransContext *txc,
 	   << " 0x" << std::hex << offset << "~" << length << std::dec
 	   << dendl;
   int r = 0;
-  o->exists = true;
-  _assign_nid(txc, o);
 
   _dump_onode(o);