]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
FileStore::_check_replay_guard avoids double check on replaying and can_checkpoint() 6471/head
authorNing Yao <zay11022@gmail.com>
Thu, 5 Nov 2015 09:49:31 +0000 (17:49 +0800)
committerNing Yao <zay11022@gmail.com>
Thu, 5 Nov 2015 09:49:31 +0000 (17:49 +0800)
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>
src/os/FileStore.cc

index 16917c2388031bfce7802a25316384814c3e852f..aa57398f5ad0015a496ae553799f28374efd73a5 100644 (file)
@@ -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);