From e767f8a3cea31382fb9bac0ad05ae2f764ddfb1c Mon Sep 17 00:00:00 2001 From: root Date: Sun, 12 Nov 2017 21:06:39 +0800 Subject: [PATCH] MDS: simplify the code in replay_alloc_ids Signed-off-by: dongdong tao --- src/mds/InoTable.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc index fc1faa876427..117280cc0c40 100644 --- a/src/mds/InoTable.cc +++ b/src/mds/InoTable.cc @@ -119,15 +119,13 @@ void InoTable::replay_alloc_ids(interval_set& ids) dout(10) << "replay_alloc_ids " << ids << dendl; interval_set is; is.intersection_of(free, ids); - if (is == ids) { - free.subtract(ids); - projected_free.subtract(ids); - } else { + if (!(is==ids)) { mds->clog->error() << "journal replay alloc " << ids << ", only " << is << " is in free " << free; - free.subtract(is); - projected_free.subtract(is); } + free.subtract(is); + projected_free.subtract(is); + projected_version = ++version; } void InoTable::replay_release_ids(interval_set& ids) -- 2.47.3