From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Thu, 16 Jan 2014 11:54:07 +0000 (+0800)
Subject: mds: preserve dir_auth when spliting/merging dirfrags
X-Git-Tag: v0.78~165^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98105b24487d077de31954e55c3df0b480d779bb;p=ceph.git

mds: preserve dir_auth when spliting/merging dirfrags

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 99bbc841e336..8761876d6ed5 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -896,6 +896,7 @@ void CDir::split(int bits, list<CDir*>& subs, list<Context*>& waiters, bool repl
     subs.push_back(f);
     inode->add_dirfrag(f);
 
+    f->set_dir_auth(get_dir_auth());
     f->prepare_new_fragment(replay);
   }
   
@@ -937,6 +938,7 @@ void CDir::merge(list<CDir*>& subs, list<Context*>& waiters, bool replay)
 {
   dout(10) << "merge " << subs << dendl;
 
+  set_dir_auth(subs.front()->get_dir_auth());
   prepare_new_fragment(replay);
 
   nest_info_t rstatdiff;