librbd: depends on librados

diff --git a/src/Makefile.am b/src/Makefile.am
index 32c1a3e8a808c561992fc6ec736a7e04de4a504e..275c02c0eced3ecdb96d69a69f574b7232567bdf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -226,15 +226,12 @@ librados_a_CXXFLAGS = ${AM_CXXFLAGS}
 
 # librbd
 librbd_SOURCES = \
-       librbd.cc \
-       librados.cc \
-       msg/SimpleMessenger.cc \
-       osdc/Objecter.cc \
-       ${libcommon_a_SOURCES}
+       librbd.cc
+
 librbd_la_SOURCES = ${librbd_SOURCES}
 librbd_la_CFLAGS = ${AM_CFLAGS}
 librbd_la_CXXFLAGS = ${AM_CXXFLAGS}
-librbd_la_LIBADD = libcrush.la -lpthread $(CRYPTOPP_LIBS)
+librbd_la_LIBADD = librados.la libcrush.la -lpthread $(CRYPTOPP_LIBS)
 librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^rbd_.*'
 lib_LTLIBRARIES += librbd.la
 
@@ -258,7 +255,7 @@ endif
 
 rbd_SOURCES = rbd.cc common/fiemap.cc
 rbd_CXXFLAGS = ${AM_CXXFLAGS}
-rbd_LDADD = librbd.la libcrush.la -lpthread -lm $(CRYPTOPP_LIBS)
+rbd_LDADD = librbd.la librados.la libcrush.la -lpthread -lm $(CRYPTOPP_LIBS)
 bin_PROGRAMS += rbd
 
 if WITH_DEBUG

diff --git a/src/common/Logger.cc b/src/common/Logger.cc
index 432e33edd64082747e92ca4bca5852dba53a5063..d6ebac30b7afeddbc5bc44d2a5c9ee514d1430bd 100644 (file)
--- a/src/common/Logger.cc
+++ b/src/common/Logger.cc
@@ -44,7 +44,7 @@ bool logger_need_reset = false;
 static void flush_all_loggers();
 static void stop();
 
-static struct FlusherStopper {
+struct FlusherStopper {
   ~FlusherStopper() {
     stop();
   }

diff --git a/src/rbd.cc b/src/rbd.cc
index c486ec93d924640d4932685cf9d6c0861419813c..7743cd1a201fc61d59a7bd43f4f43a0c9beaca6b 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -399,7 +399,7 @@ static int do_import(librados::pool_t pool, const char *imgname, int *order, con
           cerr << "error reading file: " << cpp_strerror(r) << std::endl;
           goto done;
         }
-       len = rval
+       size_t len = rval;
         if (!len) {
           r = 0;
           goto done;