From: Patrick Donnelly <pdonnell@ibm.com>
Date: Wed, 23 Oct 2024 16:32:05 +0000 (-0400)
Subject: client: move inode dump to print method
X-Git-Tag: v20.0.0^2~44
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c2e551260cc6f88000cfcbb25d3ed3a57b029b7e;p=ceph.git

client: move inode dump to print method

There is no functional change.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Fixes: https://tracker.ceph.com/issues/66373
---

diff --git a/src/client/Inode.cc b/src/client/Inode.cc
index 76f502422f322..be7749f211ff7 100644
--- a/src/client/Inode.cc
+++ b/src/client/Inode.cc
@@ -42,26 +42,26 @@ Inode::~Inode()
   }
 }
 
-ostream& operator<<(ostream &out, const Inode &in)
-{
-  out << in.vino() << "("
-      << "faked_ino=" << in.faked_ino
-      << " nref=" << in.get_nref()
-      << " ll_ref=" << in.ll_ref
-      << " cap_refs=" << in.cap_refs
-      << " open=" << in.open_by_mode
-      << " mode=" << oct << in.mode << dec
-      << " size=" << in.size << "/" << in.max_size
-      << " nlink=" << in.nlink
-      << " btime=" << in.btime
-      << " mtime=" << in.mtime
-      << " ctime=" << in.ctime
-      << " change_attr=" << in.change_attr
-      << " caps=" << ccap_string(in.caps_issued());
-  if (!in.caps.empty()) {
+void Inode::print(std::ostream& out) const
+{
+  out << vino() << "("
+      << "faked_ino=" << faked_ino
+      << " nref=" << get_nref()
+      << " ll_ref=" << ll_ref
+      << " cap_refs=" << cap_refs
+      << " open=" << open_by_mode
+      << " mode=" << oct << mode << dec
+      << " size=" << size << "/" << max_size
+      << " nlink=" << nlink
+      << " btime=" << btime
+      << " mtime=" << mtime
+      << " ctime=" << ctime
+      << " change_attr=" << change_attr
+      << " caps=" << ccap_string(caps_issued());
+  if (!caps.empty()) {
     out << "(";
     bool first = true;
-    for (const auto &pair : in.caps) {
+    for (const auto &pair : caps) {
       if (!first)
         out << ',';
       out << pair.first << '=' << ccap_string(pair.second.issued);
@@ -69,28 +69,28 @@ ostream& operator<<(ostream &out, const Inode &in)
     }
     out << ")";
   }
-  if (in.dirty_caps)
-    out << " dirty_caps=" << ccap_string(in.dirty_caps);
-  if (in.flushing_caps)
-    out << " flushing_caps=" << ccap_string(in.flushing_caps);
+  if (dirty_caps)
+    out << " dirty_caps=" << ccap_string(dirty_caps);
+  if (flushing_caps)
+    out << " flushing_caps=" << ccap_string(flushing_caps);
 
-  if (in.flags & I_COMPLETE)
+  if (flags & I_COMPLETE)
     out << " COMPLETE";
 
-  if (in.is_file())
-    out << " " << in.oset;
+  if (is_file())
+    out << " " << oset;
 
-  if (!in.dentries.empty())
-    out << " parents=" << in.dentries;
+  if (!dentries.empty())
+    out << " parents=" << dentries;
 
-  if (in.is_dir() && in.has_dir_layout())
+  if (is_dir() && has_dir_layout())
     out << " has_dir_layout";
 
-  if (in.quota.is_enabled())
-    out << " " << in.quota;
+  if (quota.is_enabled())
+    out << " " << quota;
 
-  out << ' ' << &in << ")";
-  return out;
+
+  out << ' ' << this << ")";
 }
 
 
diff --git a/src/client/Inode.h b/src/client/Inode.h
index 61188bd2f4479..88b7c81201d9e 100644
--- a/src/client/Inode.h
+++ b/src/client/Inode.h
@@ -329,6 +329,7 @@ struct Inode : RefCountedObject {
   void rm_fh(Fh *f) {fhs.erase(f);}
   void set_async_err(int r);
   void dump(Formatter *f) const;
+  void print(std::ostream&) const;
 
   void break_all_delegs() { break_deleg(false); };
 
@@ -360,6 +361,4 @@ private:
 
 };
 
-std::ostream& operator<<(std::ostream &out, const Inode &in);
-
 #endif