RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 18:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/wip-guard'

Browse Source
This commit is contained in:
Samuel Just 2012-04-16 14:21:52 -07:00
commit 9f5b9adaf8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/FileStore.cc
View File

@ -2731,7 +2731,7 @@ unsigned FileStore::_do_transaction(Transaction& t, uint64_t op_seq, int trans_n
{
coll_t cid = i.get_cid();
hobject_t oid = i.get_oid();
if (_check_replay_guard(cid, spos) > 0)
if (_check_replay_guard(cid, oid, spos) > 0)
r = _collection_remove(cid, oid);
}
break;
@ -2744,7 +2744,7 @@ unsigned FileStore::_do_transaction(Transaction& t, uint64_t op_seq, int trans_n
hobject_t oid = i.get_oid();
r = _collection_add(ocid, ncid, oid, spos);
if (r == 0 &&
_check_replay_guard(ocid, oid, spos))
(_check_replay_guard(ocid, oid, spos) > 0))
r = _collection_remove(ocid, oid);
}
break;