From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 9 May 2017 08:28:13 +0000 (+0800)
Subject: mds: fix dir auth calculation in CDir::merge
X-Git-Tag: v12.0.3~38^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68adc96403d76907ffdec851668014b194d0b78c;p=ceph.git

mds: fix dir auth calculation in CDir::merge

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

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 9ffe8f1db4a..814625a144f 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1014,7 +1014,7 @@ void CDir::merge(list<CDir*>& subs, list<MDSInternalContextBase*>& waiters, bool
 
   mds_authority_t new_auth = CDIR_AUTH_DEFAULT;
   for (auto dir : subs) {
-    if (dir->get_dir_auth() != CDIR_AUTH_DEFAULT ||
+    if (dir->get_dir_auth() != CDIR_AUTH_DEFAULT &&
 	dir->get_dir_auth() != new_auth) {
       assert(new_auth == CDIR_AUTH_DEFAULT);
       new_auth = dir->get_dir_auth();