client: move Inode operator<<

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d56ad6e338ec47c7ba23a5ae62634a41a7aabaf8..07e4997d44b705a4837b8799d43738b182192ef8 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -89,44 +89,6 @@ Mutex client_logger_lock("client_logger_lock");
 PerfCounters  *client_counters = 0;
 
 
-
-
-ostream& operator<<(ostream &out, Inode &in)
-{
-  out << in.vino() << "("
-      << " cap_refs=" << in.cap_refs
-      << " open=" << in.open_by_mode
-      << " ref=" << in.ref
-      << " mode=" << oct << in.mode << dec
-      << " mtime=" << in.mtime
-      << " caps=" << ccap_string(in.caps_issued());
-  if (!in.caps.empty()) {
-    out << "(";
-    for (map<int,Cap*>::iterator p = in.caps.begin(); p != in.caps.end(); ++p) {
-      if (p != in.caps.begin())
-       out << ',';
-      out << p->first << '=' << ccap_string(p->second->issued);
-    }
-    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 (in.flags & I_COMPLETE)
-    out << " COMPLETE";
-
-  set<Dentry*>::iterator i = in.dn_set.begin();
-  while(i != in.dn_set.end()) {
-      out << " parent=" << *i;
-      ++i;
-  }
-  out << ' ' << &in << ")";
-  return out;
-}
-
-
 void client_flush_set_callback(void *p, ObjectCacher::ObjectSet *oset)
 {
   Client *client = (Client*)p;

diff --git a/src/client/Inode.cc b/src/client/Inode.cc
index 99ac34b17d770ca813bfb1dd87fbc23d9a8298b1..234542ee5f47f1c5f6c53ee415e8f22ee849f790 100644 (file)
--- a/src/client/Inode.cc
+++ b/src/client/Inode.cc
@@ -4,6 +4,43 @@
 #include "Dentry.h"
 #include "Dir.h"
 
+ostream& operator<<(ostream &out, Inode &in)
+{
+  out << in.vino() << "("
+      << " cap_refs=" << in.cap_refs
+      << " open=" << in.open_by_mode
+      << " ref=" << in.ref
+      << " mode=" << oct << in.mode << dec
+      << " size=" << in.size
+      << " mtime=" << in.mtime
+      << " caps=" << ccap_string(in.caps_issued());
+  if (!in.caps.empty()) {
+    out << "(";
+    for (map<int,Cap*>::iterator p = in.caps.begin(); p != in.caps.end(); ++p) {
+      if (p != in.caps.begin())
+       out << ',';
+      out << p->first << '=' << ccap_string(p->second->issued);
+    }
+    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 (in.flags & I_COMPLETE)
+    out << " COMPLETE";
+
+  set<Dentry*>::iterator i = in.dn_set.begin();
+  while(i != in.dn_set.end()) {
+      out << " parent=" << *i;
+      ++i;
+  }
+  out << ' ' << &in << ")";
+  return out;
+}
+
+
 void Inode::make_long_path(filepath& p)
 {
   if (!dn_set.empty()) {

diff --git a/src/client/Inode.h b/src/client/Inode.h
index 30f88576f40871c3426c6e54b3322925771eb794..50174cb4b0e757052c2d320489af08d46ca1ece4 100644 (file)
--- a/src/client/Inode.h
+++ b/src/client/Inode.h
@@ -222,5 +222,6 @@ class Inode {
   Dir *open_dir();
 };
 
+ostream& operator<<(ostream &out, Inode &in);
 
 #endif