From d41ca3ae9466b1e70c15acc4259ee02592349652 Mon Sep 17 00:00:00 2001 From: sageweil Date: Wed, 8 Aug 2007 22:37:13 +0000 Subject: [PATCH] cleanups git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1603 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/sage/mds/ebofs/Ebofs.cc | 4 ++-- branches/sage/mds/ebofs/Journal.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/branches/sage/mds/ebofs/Ebofs.cc b/branches/sage/mds/ebofs/Ebofs.cc index 4b5ac572410d0..21070781c1976 100644 --- a/branches/sage/mds/ebofs/Ebofs.cc +++ b/branches/sage/mds/ebofs/Ebofs.cc @@ -269,13 +269,13 @@ int Ebofs::mkfs() // create journal? if (journalfn) { - journal = new FileJournal(this, journalfn); + Journal *journal = new FileJournal(this, journalfn); if (journal->create() < 0) { dout(3) << "mount journal " << journalfn << " created failed" << endl; - delete journal; } else { dout(3) << "mount journal " << journalfn << " created" << endl; } + delete journal; } dout(2) << "mkfs: " << dev.get_device_name() << " " << dev.get_num_blocks() << " blocks, " << nice_blocks(dev.get_num_blocks()) << endl; diff --git a/branches/sage/mds/ebofs/Journal.h b/branches/sage/mds/ebofs/Journal.h index fb1983c22eafc..9bab0b7f3c109 100644 --- a/branches/sage/mds/ebofs/Journal.h +++ b/branches/sage/mds/ebofs/Journal.h @@ -34,6 +34,7 @@ public: virtual void close() = 0; // writes + virtual void make_writeable() = 0; virtual bool submit_entry(bufferlist& e, Context *oncommit) = 0;// submit an item virtual void commit_epoch_start() = 0; // mark epoch boundary virtual void commit_epoch_finish() = 0; // mark prior epoch as committed (we can expire) -- 2.39.5