RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

OSD: use OpRequestRef& for a few require_* functions

Browse Source 
Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit eb2f1ea2c3)
This commit is contained in:
Greg Farnum 2014-07-28 14:08:30 -07:00 committed by Sage Weil
parent f86bf1d8be
commit 48c9b38414
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osd/OSD.cc
View File

@ -6668,7 +6668,7 @@ bool OSD::require_mon_peer(Message *m)
return true;
}
bool OSD::require_osd_peer(OpRequestRef op)
bool OSD::require_osd_peer(OpRequestRef& op)
{
if (!op->get_req()->get_connection()->peer_is_osd()) {
dout(0) << "require_osd_peer received from non-osd " << op->get_req()->get_connection()->get_peer_addr()
@ -6712,7 +6712,7 @@ bool OSD::require_up_osd_peer(OpRequestRef& op, OSDMapRef& map,
* require that we have same (or newer) map, and that
* the source is the pg primary.
*/
bool OSD::require_same_or_newer_map(OpRequestRef op, epoch_t epoch)
bool OSD::require_same_or_newer_map(OpRequestRef& op, epoch_t epoch)
{
Message *m = op->get_req();
dout(15) << "require_same_or_newer_map " << epoch << " (i am " << osdmap->get_epoch() << ") " << m << dendl;

4
src/osd/OSD.h
View File

@ -1809,11 +1809,11 @@ protected:
void repeer(PG *pg, map< int, map<spg_t,pg_query_t> >& query_map);
bool require_mon_peer(Message *m);
bool require_osd_peer(OpRequestRef op);
bool require_osd_peer(OpRequestRef& op);
bool require_up_osd_peer(OpRequestRef& Op, OSDMapRef& map,
epoch_t their_epoch);
bool require_same_or_newer_map(OpRequestRef op, epoch_t e);
bool require_same_or_newer_map(OpRequestRef& op, epoch_t e);
void handle_pg_query(OpRequestRef op);
void handle_pg_notify(OpRequestRef op);