diff options
| author | Samuel Just <sam.just@inktank.com> | 2014-06-27 22:27:47 +0200 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2014-06-27 22:27:47 +0200 |
| commit | 1f59e405ef2cbf9d65a45dd041e16dde686dd9b3 (patch) | |
| tree | 56bf638eb957e63ed145625cbf6ff01b5c28de53 /src/osd/PGBackend.cc | |
| parent | osd/: in scrub, check for and remove obsolete rollback objs (diff) | |
| parent | doc/release-notes: v0.82 (diff) | |
| download | ceph-1f59e405ef2cbf9d65a45dd041e16dde686dd9b3.tar.xz ceph-1f59e405ef2cbf9d65a45dd041e16dde686dd9b3.zip | |
Merge remote-tracking branch 'upstream/master' into wip-8438-master
Conflicts:
src/osd/ECMsgTypes.cc
Diffstat (limited to 'src/osd/PGBackend.cc')
| -rw-r--r-- | src/osd/PGBackend.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index 6a1a818eae6..09cbe8daa50 100644 --- a/src/osd/PGBackend.cc +++ b/src/osd/PGBackend.cc @@ -205,7 +205,6 @@ void PGBackend::rollback_setattrs( map<string, boost::optional<bufferlist> > &old_attrs, ObjectStore::Transaction *t) { map<string, bufferlist> to_set; - set<string> to_remove; assert(!hoid.is_temp()); for (map<string, boost::optional<bufferlist> >::iterator i = old_attrs.begin(); i != old_attrs.end(); @@ -511,7 +510,7 @@ void PGBackend::be_compare_scrubmaps( map<hobject_t, pg_shard_t> &authoritative, map<hobject_t, set<pg_shard_t> > &invalid_snapcolls, int &shallow_errors, int &deep_errors, - const spg_t pgid, + const spg_t& pgid, const vector<int> &acting, ostream &errorstream) { |