From: Rishabh Dave <ridave@redhat.com>
Date: Tue, 16 Sep 2025 14:18:19 +0000 (+0530)
Subject: mds: fix few log entries
X-Git-Tag: testing/wip-jcollin-testing-20251016.112434-squid^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=604f0ff80704d7a3964da929a29872aac9f32f77;p=ceph-ci.git

mds: fix few log entries

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit e4c301b9f0204b6a82490a68ec4c3a26db7b013f)

Conflicts:
src/mds/MDSAuthCaps.cc
- is_capable()'s log message is slightly different in Squid branch
  leading to conflict.
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index d04d540d8f2..80903222c40 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -8886,7 +8886,7 @@ void Server::_rmdir_rollback_finish(const MDRequestRef& mdr, metareqid_t reqid,
  */
 bool Server::_dir_is_nonempty_unlocked(const MDRequestRef& mdr, CInode *in)
 {
-  dout(10) << "dir_is_nonempty_unlocked " << *in << dendl;
+  dout(10) << __func__ << " " << *in << dendl;
   ceph_assert(in->is_auth());
 
   if (in->filelock.is_cached())
@@ -8899,7 +8899,7 @@ bool Server::_dir_is_nonempty_unlocked(const MDRequestRef& mdr, CInode *in)
     // is the frag obviously non-empty?
     if (dir->is_auth()) {
       if (dir->get_projected_fnode()->fragstat.size()) {
-	dout(10) << "dir_is_nonempty_unlocked dirstat has " 
+	dout(10) << __func__ << " dirstat has "
 		 << dir->get_projected_fnode()->fragstat.size() << " items " << *dir << dendl;
 	return true;
       }