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 9ffe8f1db4acd5bda882cff37c8291b95e8810a3..814625a144f3bb6463779540bafb13f53ace8d8c 100644 (file)
--- 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();