From: David Zafman Date: Thu, 30 Jan 2014 01:14:09 +0000 (-0800) Subject: osd: Change some be_compare_scrub_objects() args to const X-Git-Tag: v0.78~237^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48fbccece578c70794952d3d64b5a03a8b9685b4;p=ceph.git osd: Change some be_compare_scrub_objects() args to const Signed-off-by: David Zafman --- diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h index a95c716559f3..b887b141086b 100644 --- a/src/osd/PGBackend.h +++ b/src/osd/PGBackend.h @@ -434,8 +434,8 @@ virtual void be_scan_list(ScrubMap &map, const vector &ls, bool deep, ThreadPool::TPHandle &handle) { assert(0); } virtual enum scrub_error_type be_compare_scrub_objects( - ScrubMap::object &auth, - ScrubMap::object &candidate, + const ScrubMap::object &auth, + const ScrubMap::object &candidate, ostream &errorstream) { assert(0); } virtual map::const_iterator be_select_auth_object( const hobject_t &obj, diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 16eef86d8815..6d7d2e513918 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -869,8 +869,8 @@ void ReplicatedBackend::be_scan_list( } enum scrub_error_type ReplicatedBackend::be_compare_scrub_objects( - ScrubMap::object &auth, - ScrubMap::object &candidate, + const ScrubMap::object &auth, + const ScrubMap::object &candidate, ostream &errorstream) { enum scrub_error_type error = CLEAN; diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index 1c66c4aa586e..0f9cf5654ada 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -493,8 +493,8 @@ private: void be_scan_list(ScrubMap &map, const vector &ls, bool deep, ThreadPool::TPHandle &handle); enum scrub_error_type be_compare_scrub_objects( - ScrubMap::object &auth, - ScrubMap::object &candidate, + const ScrubMap::object &auth, + const ScrubMap::object &candidate, ostream &errorstream); map::const_iterator be_select_auth_object( const hobject_t &obj,