diff options
| author | Samuel Just <samuel.just@dreamhost.com> | 2012-04-16 14:21:52 -0700 |
|---|---|---|
| committer | Samuel Just <samuel.just@dreamhost.com> | 2012-04-16 14:21:52 -0700 |
| commit | 9f5b9adaf8c37534752ec8484ad353bdd98334c9 (patch) | |
| tree | f2359f523cce25f19d4f2ce0dc2ddbacc46d942f /src/os/FileStore.cc | |
| parent | 1bc01289993d6a451cba92189838299f1be3a7e2 (diff) | |
| parent | 2f5af83f5dbcdd1eebcf8e6e7bf8e9266c672804 (diff) | |
| download | ceph-9f5b9adaf8c37534752ec8484ad353bdd98334c9.tar.gz | |
Merge remote branch 'upstream/wip-guard'
Diffstat (limited to 'src/os/FileStore.cc')
| -rw-r--r-- | src/os/FileStore.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index cf8886cf29a..868e39ecff0 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -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; |