]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: properly set new dirfrag's dir_auth when merging dirfrags 14550/head
authorYan, Zheng <zyan@redhat.com>
Wed, 10 May 2017 07:03:29 +0000 (15:03 +0800)
committerYan, Zheng <zyan@redhat.com>
Thu, 11 May 2017 06:13:24 +0000 (14:13 +0800)
new dirfrag's dir_auth is updated at very beginning of CDir::merge()

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
src/mds/CDir.cc

index 86ba961be1bbf03324d9e5f56d1253817fe589b4..bed44fbddde6330a26c4db682a02d28c16bc6e1e 100644 (file)
@@ -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());