From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 17 Oct 2016 06:15:21 +0000 (+0800)
Subject: mds: check inode's direct parent in inode_backtrace_t::compare
X-Git-Tag: v11.1.0~516^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5b61876a9296530c845787f08147241af8b9053;p=ceph.git

mds: check inode's direct parent in inode_backtrace_t::compare

inode's direct parents must be equivalent for non-divergent
backtraces

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

diff --git a/src/mds/inode_backtrace.cc b/src/mds/inode_backtrace.cc
index bde2145ebf24..37c052982e9a 100644
--- a/src/mds/inode_backtrace.cc
+++ b/src/mds/inode_backtrace.cc
@@ -130,6 +130,8 @@ int inode_backtrace_t::compare(const inode_backtrace_t& other,
     comparator = 1;
   else if (ancestors[0].version < other.ancestors[0].version)
     comparator = -1;
+  if (ancestors[0].dirino != other.ancestors[0].dirino)
+    *divergent = true;
   for (int i = 1; i < min_size; ++i) {
     if (*divergent) {
       /**