From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 10 May 2017 07:03:29 +0000 (+0800)
Subject: mds: properly set new dirfrag's dir_auth when merging dirfrags
X-Git-Tag: v12.1.0~10^2~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5a556d5545f6df6a475101fae6f6156a6ff2c17;p=ceph.git

mds: properly set new dirfrag's dir_auth when merging dirfrags

new dirfrag's dir_auth is updated at very beginning of CDir::merge()

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 86ba961be1bb..bed44fbddde6 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1099,7 +1099,6 @@ void CDir::merge(list<CDir*>& subs, list<MDSInternalContextBase*>& waiters, bool
 
     // merge state
     state_set(dir->get_state() & MASK_STATE_FRAGMENT_KEPT);
-    dir_auth = dir->dir_auth;
 
     dir->finish_old_fragment(waiters, replay);
     inode->close_dirfrag(dir->get_frag());