From: root <tdd108128@163.com>
Date: Sun, 12 Nov 2017 13:06:39 +0000 (+0800)
Subject: MDS: simplify the code in replay_alloc_ids
X-Git-Tag: v13.0.1~169^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e767f8a3cea31382fb9bac0ad05ae2f764ddfb1c;p=ceph.git

MDS: simplify the code in replay_alloc_ids

Signed-off-by: dongdong tao <tdd21151186@gmail.com>
---

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<inodeno_t>& ids)
   dout(10) << "replay_alloc_ids " << ids << dendl;
   interval_set<inodeno_t> 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<inodeno_t>& ids)