From: Ning Yao <zay11022@gmail.com>
Date: Thu, 5 Nov 2015 09:49:31 +0000 (+0800)
Subject: FileStore::_check_replay_guard avoids double check on replaying and can_checkpoint()
X-Git-Tag: v10.0.1~90^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=619d8048660a30672dd804caef38dac6aaa24ad2;p=ceph.git

FileStore::_check_replay_guard avoids double check on replaying and can_checkpoint()
Already checked in _check_replay_guard, avoid double check in the inner function _check_global_replay_guard

Signed-off-by: Ning Yao <zay11022@gmail.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 16917c23880..aa57398f5ad 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -2126,9 +2126,6 @@ void FileStore::_set_global_replay_guard(coll_t cid,
 int FileStore::_check_global_replay_guard(coll_t cid,
 					  const SequencerPosition& spos)
 {
-  if (!replaying || backend->can_checkpoint())
-    return 1;
-
   char fn[PATH_MAX];
   get_cdir(cid, fn, sizeof(fn));
   int fd = ::open(fn, O_RDONLY);