From 8c86b9790ba67a3499043fe8f8fca52be79bcb75 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Tue, 18 Mar 2025 08:58:01 +0000 Subject: [PATCH] Revert "multi-mds/unlink: Unlink referent inode on dentry replicas" This reverts commit 42d88f4072f6df16bdff3a36ddcc8d5bf5413824. Signed-off-by: Venky Shankar (cherry picked from commit eb4833bcea948a3882e852b1c36247c5addb4c0f) --- src/mds/MDCache.cc | 21 --------------------- src/mds/Server.cc | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index e48c81f9be2..324204d5f1b 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -11610,7 +11610,6 @@ void MDCache::handle_dentry_unlink(const cref_t &m) // open inode? if (dnl->is_primary()) { - dout(7) << __func__ << " primary dentry " << *dn << dendl; CInode *in = dnl->get_inode(); dn->dir->unlink_inode(dn); ceph_assert(straydn); @@ -11639,26 +11638,6 @@ void MDCache::handle_dentry_unlink(const cref_t &m) migrator->export_caps(in); straydn = NULL; - } else if (dnl->is_referent_remote()) { - dout(7) << __func__ << " remote referent dentry " << *dn << dendl; - CInode *ref_in = dnl->get_referent_inode(); - dn->dir->unlink_inode(dn); - ceph_assert(straydn); - straydn->dir->link_primary_inode(straydn, ref_in); - - // ref_in->first is lazily updated on replica; drag it forward so - // that we always keep it in sync with the dnq - ceph_assert(straydn->first >= ref_in->first); - ref_in->first = straydn->first; - - //No snapshots on referent - ignore snaprealm invalidate - - // send caps to auth (if we're not already) - if (ref_in->is_any_caps() && - !ref_in->state_test(CInode::STATE_EXPORTINGCAPS)) - migrator->export_caps(ref_in); - - straydn = nullptr; } else { ceph_assert(!straydn); ceph_assert(dnl->is_remote()); diff --git a/src/mds/Server.cc b/src/mds/Server.cc index b4d16cc3b79..d3f14aea2ae 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -8062,7 +8062,7 @@ void Server::_link_remote_finish(const MDRequestRef& mdr, bool inc, if (inc) mdcache->send_dentry_link(dn, null_ref); else - mdcache->send_dentry_unlink(dn, straydn ? straydn : nullptr, null_ref); + mdcache->send_dentry_unlink(dn, NULL, null_ref); // bump target popularity mds->balancer->hit_inode(targeti, META_POP_IWR); -- 2.39.5