From 746447327e9d74d0af69cadf2dce6c70c2caa4aa Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Apr 2011 11:25:05 -0700 Subject: [PATCH] mds: small journaler cleanups Signed-off-by: Sage Weil --- src/mds/MDLog.cc | 2 +- src/osdc/Journaler.cc | 5 ++--- src/osdc/Journaler.h | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 2f0d226d67950..9ebe9368e6591 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -123,7 +123,7 @@ void MDLog::create(Context *c) init_journaler(); journaler->set_writeable(); journaler->create(&mds->mdcache->default_log_layout); - write_head(c); + journaler->write_head(c); logger->set(l_mdl_expos, journaler->get_expire_pos()); logger->set(l_mdl_wrpos, journaler->get_write_pos()); diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index d9d2f0b9aeb3d..add38c69be903 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -171,7 +171,7 @@ void Journaler::reread_head(Context *onfinish) void Journaler::_finish_reread_head(int r, bufferlist& bl, Context *finish) { //read on-disk header into - assert (bl.length()); + assert(bl.length()); // unpack header Header h; @@ -326,7 +326,7 @@ public: void Journaler::write_head(Context *oncommit) { - assert (!readonly); + assert(!readonly); assert(state == STATE_ACTIVE); last_written.trimmed_pos = trimmed_pos; last_written.expire_pos = expire_pos; @@ -874,7 +874,6 @@ void Journaler::trim() { assert(!readonly); uint64_t period = get_layout_period(); - uint64_t trim_to = last_committed.expire_pos; trim_to -= trim_to % period; dout(10) << "trim last_commited head was " << last_committed diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h index c1fb7db51017f..020921395aa39 100644 --- a/src/osdc/Journaler.h +++ b/src/osdc/Journaler.h @@ -319,8 +319,6 @@ public: void set_expire_pos(int64_t ep) { expire_pos = ep; } void set_trimmed_pos(int64_t p) { trimming_pos = trimmed_pos = p; } void trim(); - //bool is_trimmable() { return trimming_pos < expire_pos; } - //void trim(int64_t trim_to=0, Context *c=0); }; WRITE_CLASS_ENCODER(Journaler::Header) -- 2.39.5