buffer: cleanups

diff --git a/src/Makefile.am b/src/Makefile.am
index 37d8019e151a0ab74863fa45e51db77e4b3f5b3a..245b9a6d473bebff848173451b60245d6a588fca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,7 +200,6 @@ libcommon_files = \
        auth/ExportControl.cc \
        common/LogClient.cc \
        msg/Message.cc \
-       common/buffer.cc \
        common/Logger.cc \
        common/Clock.cc \
        common/Timer.cc \
@@ -217,6 +216,7 @@ libcommon_files = \
        mds/MDSMap.cc \
        common/tls.cc \
        common/common_init.cc \
+       common/buffer.cc \
        config.cc \
        common/lockdep.cc
 

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index cbcab550507219b4ff922f3ff9e3d679b32d0dac..c985c75a4949eaeb46d34c601bfef8d80ab04bad 100644 (file)
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <fstream>
 
+atomic_t buffer_total_alloc;
 
 int buffer::list::read_file(const char *fn)
 {

diff --git a/src/config.cc b/src/config.cc
index b0aaf0df9395f240007c65febacab756805c1855..bf96d688eb0ca36d5456ff36e0723b1a4681ac4b 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -30,9 +30,7 @@
 #include "include/tstring.h"
 stringtable g_stab;
 
-// hack hack hack ugly FIXME
 #include "include/atomic.h"
-atomic_t buffer_total_alloc;
 
 #include "osd/osd_types.h"
 

diff --git a/src/include/buffer.h b/src/include/buffer.h
index c6818af5d767592e6b77861fb3a2ff17eff2b1e0..e573755d6df1eb69f698e85f97e9acf92cd1a266 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -54,11 +54,7 @@ using std::string;
 #include "crc32c.h"
 #include "assert.h"
 
-// <hack>
-//  these are in config.o
 extern atomic_t buffer_total_alloc;
-// </hack>
-
 
 class buffer {
 private: