From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Aug 2015 19:22:26 +0000 (-0400)
Subject: os/newstore: drop sync_and_flush
X-Git-Tag: v9.1.0~242^2~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f93856f71a644dff03478c77d0513efdb69207d6;p=ceph.git

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 3b6b8e6bdb62..c4b09f74d540 100644
--- 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 381044da1f46..c93f189507b0 100644
--- 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;