import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / mds / CInode.cc

diff --git a/ceph/src/mds/CInode.cc b/ceph/src/mds/CInode.cc
index 6c8084bb0a4d7f99bae5952b0645cde17f5c126c..3209763b7b075f1f9995430f4689a92ec585ba58 100644 (file)
--- a/ceph/src/mds/CInode.cc
+++ b/ceph/src/mds/CInode.cc
@@ -2817,7 +2817,8 @@ void CInode::decode_snap_blob(const bufferlist& snapbl)
       }
     }
     dout(20) << __func__ << " " << *snaprealm << dendl;
-  } else if (snaprealm) {
+  } else if (snaprealm &&
+            !is_root() && !is_mdsdir()) { // see https://tracker.ceph.com/issues/42675
     ceph_assert(mdcache->mds->is_any_replay());
     snaprealm->merge_to(NULL);
   }