From b33e265edbbfd41be5e4fb4abdae78f89b92fbfc Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 13 Oct 2016 18:21:29 +0100 Subject: [PATCH] mds: remove unused EFragment::OP_ONESHOT EFragment::decode had a minimum version of 4, and the only way you could get the ONESHOT value was if you had a struct_v < 2. Signed-off-by: John Spray --- src/mds/events/EFragment.h | 3 +-- src/mds/journal.cc | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mds/events/EFragment.h b/src/mds/events/EFragment.h index 4cc2c368d956d..cb3111c8a3f77 100644 --- a/src/mds/events/EFragment.h +++ b/src/mds/events/EFragment.h @@ -49,8 +49,7 @@ public: OP_PREPARE = 1, OP_COMMIT = 2, OP_ROLLBACK = 3, - OP_FINISH = 4, // finish deleting orphan dirfrags - OP_ONESHOT = 5, // (legacy) PREPARE+COMMIT + OP_FINISH = 4 // finish deleting orphan dirfrags }; static const char *op_name(int o) { switch (o) { diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 53eb4b3ff2e9e..6314ba8a2c6b1 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -2745,8 +2745,7 @@ void EFragment::replay(MDSRank *mds) switch (op) { case OP_PREPARE: mds->mdcache->add_uncommitted_fragment(dirfrag_t(ino, basefrag), bits, orig_frags, _segment, &rollback); - // fall-thru - case OP_ONESHOT: + if (in) mds->mdcache->adjust_dir_fragments(in, basefrag, bits, resultfrags, waiters, true); break; @@ -2798,8 +2797,6 @@ void EFragment::decode(bufferlist::iterator &bl) { ::decode(stamp, bl); if (struct_v >= 3) ::decode(op, bl); - else - op = OP_ONESHOT; ::decode(ino, bl); ::decode(basefrag, bl); ::decode(bits, bl); -- 2.47.3