From: Rishabh Dave Date: Mon, 2 Mar 2026 16:16:32 +0000 (+0530) Subject: mds: rename a finisher method in Server.cc since... X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=047f41aac142bd70d07e25affed7d99cbd96320c;p=ceph.git mds: rename a finisher method in Server.cc since... it will be used in a different context as well in the upcoming commit. Signed-off-by: Rishabh Dave --- diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 688c21d3364..12636a0e363 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -11778,13 +11778,13 @@ void Server::_rmsnap_finish(const MDRequestRef& mdr, CInode *diri, snapid_t snap diri->purge_stale_snap_data(diri->snaprealm->get_snaps()); } -struct C_MDS_renamesnap_finish : public ServerLogContext { +struct C_MDS_SnapMutateGeneric_finish : public ServerLogContext { CInode *diri; snapid_t snapid; - C_MDS_renamesnap_finish(Server *s, const MDRequestRef& r, CInode *di, snapid_t sn) : + C_MDS_SnapMutateGeneric_finish(Server *s, const MDRequestRef& r, CInode *di, snapid_t sn) : ServerLogContext(s, r), diri(di), snapid(sn) {} void finish(int r) override { - server->_renamesnap_finish(mdr, diri, snapid); + server->_snap_mutate_generic_finish(mdr, diri, snapid); } }; @@ -11890,14 +11890,16 @@ void Server::handle_client_renamesnap(const MDRequestRef& mdr) mdcache->journal_dirty_inode(mdr.get(), &le->metablob, diri); // journal the snaprealm changes - submit_mdlog_entry(le, new C_MDS_renamesnap_finish(this, mdr, diri, snapid), + submit_mdlog_entry(le, new C_MDS_SnapMutateGeneric_finish(this, mdr, diri, snapid), mdr, __func__); mdlog->flush(); } -void Server::_renamesnap_finish(const MDRequestRef& mdr, CInode *diri, snapid_t snapid) +// Finisher method for updating any snapshot metadata, be it custom user metadata +// or snapshot name +void Server::_snap_mutate_generic_finish(const MDRequestRef& mdr, CInode *diri, snapid_t snapid) { - dout(10) << "_renamesnap_finish " << *mdr << " " << snapid << dendl; + dout(10) << __func__ << " " << *mdr << " " << snapid << dendl; mdr->apply(); diff --git a/src/mds/Server.h b/src/mds/Server.h index b8cfb56452e..e9e9bf4ae25 100644 --- a/src/mds/Server.h +++ b/src/mds/Server.h @@ -347,7 +347,7 @@ public: void handle_client_rmsnap(const MDRequestRef& mdr); void _rmsnap_finish(const MDRequestRef& mdr, CInode *diri, snapid_t snapid); void handle_client_renamesnap(const MDRequestRef& mdr); - void _renamesnap_finish(const MDRequestRef& mdr, CInode *diri, snapid_t snapid); + void _snap_mutate_generic_finish(const MDRequestRef& mdr, CInode *diri, snapid_t snapid); void handle_client_readdir_snapdiff(const MDRequestRef& mdr); void handle_client_file_blockdiff(const MDRequestRef& mdr); void handle_file_blockdiff_finish(const MDRequestRef& mdr, CInode *in, const BlockDiff &block_diff,