From: Greg Farnum <greg@inktank.com>
Date: Mon, 28 Jul 2014 21:08:30 +0000 (-0700)
Subject: OSD: use OpRequestRef& for a few require_* functions
X-Git-Tag: v0.84~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=48c9b38414e14ef9e4c6068dc3e22e2488f03b6f;p=ceph.git

OSD: use OpRequestRef& for a few require_* functions

Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit eb2f1ea2c33647934af878b504383829f5a198ce)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d9213b5a5eb..36cfa6dd4d1 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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;
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 124b3d77dd8..180951b8760 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -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);