From 5282af61c45f981f365622ba43e833aca4199896 Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 19 Jul 2018 13:58:38 -0700
Subject: [PATCH] mds: refactor ostream passing

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---
 src/mds/MDSRank.cc | 16 +++++++---------
 src/mds/MDSRank.h  |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 9d7b77dc213..2bccbe6c0cc 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -2294,7 +2294,7 @@ void MDSRank::command_flush_journal(Formatter *f)
   assert(f != NULL);
 
   std::stringstream ss;
-  const int r = _command_flush_journal(&ss);
+  const int r = _command_flush_journal(ss);
   f->open_object_section("result");
   f->dump_string("message", ss.str());
   f->dump_int("return_code", r);
@@ -2308,10 +2308,8 @@ void MDSRank::command_flush_journal(Formatter *f)
  * Optionally populate with a human readable string describing the
  * reason for any unexpected return status.
  */
-int MDSRank::_command_flush_journal(std::stringstream *ss)
+int MDSRank::_command_flush_journal(std::ostream& ss)
 {
-  assert(ss != NULL);
-
   Mutex::Locker l(mds_lock);
 
   if (mdcache->is_readonly()) {
@@ -2339,7 +2337,7 @@ int MDSRank::_command_flush_journal(std::stringstream *ss)
     r = mdlog_flushed.wait();
     mds_lock.Lock();
     if (r != 0) {
-      *ss << "Error " << r << " (" << cpp_strerror(r) << ") while flushing journal";
+      ss << "Error " << r << " (" << cpp_strerror(r) << ") while flushing journal";
       return r;
     }
   }
@@ -2356,7 +2354,7 @@ int MDSRank::_command_flush_journal(std::stringstream *ss)
     r = mdlog_cleared.wait();
     mds_lock.Lock();
     if (r != 0) {
-      *ss << "Error " << r << " (" << cpp_strerror(r) << ") while flushing journal";
+      ss << "Error " << r << " (" << cpp_strerror(r) << ") while flushing journal";
       return r;
     }
   }
@@ -2365,7 +2363,7 @@ int MDSRank::_command_flush_journal(std::stringstream *ss)
   dout(5) << __func__ << ": beginning segment expiry" << dendl;
   r = mdlog->trim_all();
   if (r != 0) {
-    *ss << "Error " << r << " (" << cpp_strerror(r) << ") while trimming log";
+    ss << "Error " << r << " (" << cpp_strerror(r) << ") while trimming log";
     return r;
   }
 
@@ -2411,7 +2409,7 @@ int MDSRank::_command_flush_journal(std::stringstream *ss)
   r = wrote_head.wait();
   mds_lock.Lock();
   if (r != 0) {
-      *ss << "Error " << r << " (" << cpp_strerror(r) << ") while writing header";
+      ss << "Error " << r << " (" << cpp_strerror(r) << ") while writing header";
       return r;
   }
 
@@ -2869,7 +2867,7 @@ void MDSRankDispatcher::handle_osd_map()
 }
 
 bool MDSRank::evict_client(int64_t session_id,
-    bool wait, bool blacklist, std::stringstream& err_ss,
+    bool wait, bool blacklist, std::ostream& err_ss,
     Context *on_killed)
 {
   assert(mds_lock.is_locked_by_me());
diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h
index dab99d5b6fe..fa5d3a16d6f 100644
--- a/src/mds/MDSRank.h
+++ b/src/mds/MDSRank.h
@@ -433,7 +433,7 @@ class MDSRank {
     }
 
     bool evict_client(int64_t session_id, bool wait, bool blacklist,
-                      std::stringstream& ss, Context *on_killed=nullptr);
+                      std::ostream& ss, Context *on_killed=nullptr);
 
     void mark_base_recursively_scrubbed(inodeno_t ino);
 
@@ -458,7 +458,7 @@ class MDSRank {
         std::ostream &ss,
         Formatter *f);
     int _command_export_dir(std::string_view path, mds_rank_t dest);
-    int _command_flush_journal(std::stringstream *ss);
+    int _command_flush_journal(std::ostream& ss);
     CDir *_command_dirfrag_get(
         const cmdmap_t &cmdmap,
         std::ostream &ss);