os/newstore: drop sync_and_flush

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index 3b6b8e6bdb6242d18d8043a2f31b396316dd85a7..c4b09f74d5403b07100b8e239c2bb16371da9dab 100644 (file)
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -975,7 +975,7 @@ int NewStore::umount()
   assert(mounted);
   dout(1) << __func__ << dendl;
 
-  sync_and_flush();
+  sync();
   _reap_collections();
 
   dout(20) << __func__ << " stopping fsync_wq" << dendl;
@@ -1003,17 +1003,12 @@ void NewStore::sync(Context *onsync)
 #warning write sync
 }
 
-void NewStore::sync()
-{
-#warning write sync
-}
-
 void NewStore::flush()
 {
 #warning write flush
 }
 
-void NewStore::sync_and_flush()
+void NewStore::sync()
 {
   dout(10) << __func__ << dendl;
 

diff --git a/src/os/newstore/NewStore.h b/src/os/newstore/NewStore.h
index 381044da1f46a9dd83efc8c47c23b62a9560a216..c93f189507b0cad473475ed5014eb17c04700732 100644 (file)
--- a/src/os/newstore/NewStore.h
+++ b/src/os/newstore/NewStore.h
@@ -473,7 +473,6 @@ public:
   void sync(Context *onsync);
   void sync();
   void flush();
-  void sync_and_flush();
 
   unsigned get_max_object_name_length() {
     return 4096;