]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
MDS: simplify the code in replay_alloc_ids 18893/head
authorroot <tdd108128@163.com>
Sun, 12 Nov 2017 13:06:39 +0000 (21:06 +0800)
committerroot <tdd108128@163.com>
Sun, 12 Nov 2017 13:15:03 +0000 (21:15 +0800)
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
src/mds/InoTable.cc

index fc1faa876427cd430c4cb3212327d4ef25ae7e56..117280cc0c4099540f0dd8b7b42f9e9ae12327d7 100644 (file)
@@ -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)