* turn down debugginb in ebofs

* trivial replay bug in ebofs

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1492 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/ebofs/Ebofs.cc b/trunk/ceph/ebofs/Ebofs.cc
index f315d0385016f385f0771bcae4909eae2eda45da..b2a076c6994172effd1bcbd45caa656210874a9a 100644 (file)
--- a/trunk/ceph/ebofs/Ebofs.cc
+++ b/trunk/ceph/ebofs/Ebofs.cc
@@ -127,6 +127,7 @@ int Ebofs::mount()
 
        if (e < super_epoch) {
          dout(-3) << "mount replay: skipping old entry in epoch " << e << " < " << super_epoch << endl;
+         continue;
        }
        if (e == super_epoch+1) {
          super_epoch++;

diff --git a/trunk/ceph/ebofs/FileJournal.cc b/trunk/ceph/ebofs/FileJournal.cc
index 74edecf41c71a023ebc5b36785e3bc80f2a3e041..8bc942c861b92ecb605868c75ad613482a1aa121 100644 (file)
--- a/trunk/ceph/ebofs/FileJournal.cc
+++ b/trunk/ceph/ebofs/FileJournal.cc
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #undef dout
-#define dout(x) if (true || x <= g_conf.debug_ebofs) cout << "ebofs(" << ebofs->dev.get_device_name() << ").journal "
+#define dout(x) if (x <= g_conf.debug_ebofs) cout << "ebofs(" << ebofs->dev.get_device_name() << ").journal "
 #define derr(x) if (x <= g_conf.debug_ebofs) cerr << "ebofs(" << ebofs->dev.get_device_name() << ").journal "