diff options
author | Sage Weil <sage@newdream.net> | 2012-02-23 16:35:22 -0800 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2012-02-23 16:35:41 -0800 |
commit | 065d6dd8d7645e7813cd063863c414d6d6345cb2 (patch) | |
tree | bbd6216dc677b82202b7952f8343a04a8fe59470 | |
parent | 159f2b864c2b9e63b61971548652e0619a510d1c (diff) | |
download | ceph-065d6dd8d7645e7813cd063863c414d6d6345cb2.tar.gz |
mds: clean up useless block
Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r-- | src/mds/Resetter.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mds/Resetter.cc b/src/mds/Resetter.cc index 1ce35096764..bc308fe4a46 100644 --- a/src/mds/Resetter.cc +++ b/src/mds/Resetter.cc @@ -138,19 +138,17 @@ void Resetter::reset() journaler->set_trimmed_pos(new_start); journaler->set_writeable(); - { - cout << "writing journal head" << std::endl; - journaler->write_head(new C_SafeCond(&mylock, &cond, &done, &r)); - lock.Unlock(); - - mylock.Lock(); - while (!done) - cond.Wait(mylock); - mylock.Unlock(); + cout << "writing journal head" << std::endl; + journaler->write_head(new C_SafeCond(&mylock, &cond, &done, &r)); + lock.Unlock(); + + mylock.Lock(); + while (!done) + cond.Wait(mylock); + mylock.Unlock(); - lock.Lock(); - assert(r == 0); - } + lock.Lock(); + assert(r == 0); LogEvent *le = new EResetJournal; |