Skip to content

Commit

Permalink
Revert "Merge pull request ceph#12978 from asheplyakov/jewel-18581"
Browse files Browse the repository at this point in the history
See: http://tracker.ceph.com/issues/18809

This reverts commit 8e69580, reversing
changes made to c05730c.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 0cf7a61)

Conflicts:
	src/osd/ReplicatedPG.h
  • Loading branch information
athanatos authored and shinobu-x committed Feb 23, 2017
1 parent 49fd6be commit 9557675
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions src/osd/ReplicatedPG.h
Expand Up @@ -384,33 +384,6 @@ class ReplicatedPG : public PG, public PGBackend::Listener {
return get_object_context(hoid, true, &attrs);
}

bool try_lock_for_read(
const hobject_t &hoid,
ObcLockManager &manager) override {
if (is_missing_object(hoid))
return false;
auto obc = get_object_context(hoid, false, nullptr);
if (!obc)
return false;
return manager.try_get_read_lock(hoid, obc);
}

void release_locks(ObcLockManager &manager) {
release_object_locks(manager);
}

void pgb_set_object_snap_mapping(
const hobject_t &soid,
const set<snapid_t> &snaps,
ObjectStore::Transaction *t) override {
return update_object_snap_mapping(t, soid, snaps);
}
void pgb_clear_object_snap_mapping(
const hobject_t &soid,
ObjectStore::Transaction *t) override {
return clear_object_snap_mapping(t, soid);
}

void log_operation(
const vector<pg_log_entry_t> &logv,
boost::optional<pg_hit_set_history_t> &hset_history,
Expand Down

0 comments on commit 9557675

Please sign in to comment.