From: Kefu Chai Date: Sat, 6 Aug 2016 16:58:04 +0000 (+0800) Subject: mon/PGMonitor: mark dump_object_stat_sum() as static X-Git-Tag: v0.94.10~50^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d62258c03492fca5fca99650cc7514348251cb7b;p=ceph.git mon/PGMonitor: mark dump_object_stat_sum() as static so we can test this method without create an instance of PGMonitor. Signed-off-by: Kefu Chai (cherry picked from commit af3d3e25823ca9b40ddf09835edb82795ac68f33) Conflicts: src/mon/PGMonitor.cc ("const" suffix of function definition was removed in master, but in hammer it wasn't there, so no change necessary) src/mon/PGMonitor.h (added static prefix to function declaration; did not remove "const" suffix because it wasn't there in hammer) --- diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h index 4161a029fc9..746b260aa8e 100644 --- a/src/mon/PGMonitor.h +++ b/src/mon/PGMonitor.h @@ -145,7 +145,7 @@ private: int threshold, vector& args) const; - void dump_object_stat_sum(TextTable &tbl, Formatter *f, + static void dump_object_stat_sum(TextTable &tbl, Formatter *f, object_stat_sum_t &sum, uint64_t avail, float raw_used_rate,