From: Zhiqiang Wang <zhiqiang.wang@intel.com>
Date: Wed, 29 Jul 2015 07:48:04 +0000 (+0800)
Subject: osd: remove unused parameter of start_recovery_ops
X-Git-Tag: v9.1.0~281^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=178d4d5c0ca590cf4d1848173bd4031e6956d801;p=ceph.git

osd: remove unused parameter of start_recovery_ops

The RecoveryCtx parameter is not needed.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f8660c07c763..b9f307c4cadc 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7843,7 +7843,7 @@ void OSD::do_recovery(PG *pg, ThreadPool::TPHandle &handle)
     rctx.handle = &handle;
 
     int started;
-    bool more = pg->start_recovery_ops(max, &rctx, handle, &started);
+    bool more = pg->start_recovery_ops(max, handle, &started);
     dout(10) << "do_recovery started " << started << "/" << max << " on " << *pg << dendl;
 
     /*
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 6b8578aefee8..aa509e4f577c 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1032,8 +1032,7 @@ public:
    * @returns true if any useful work was accomplished; false otherwise
    */
   virtual bool start_recovery_ops(
-    int max, RecoveryCtx *prctx,
-    ThreadPool::TPHandle &handle,
+    int max, ThreadPool::TPHandle &handle,
     int *ops_begun) = 0;
 
   void purge_strays();
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 08a29c735af7..5c39143ed2ea 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -9450,8 +9450,7 @@ void PG::MissingLoc::check_recovery_sources(const OSDMapRef osdmap)
   
 
 bool ReplicatedPG::start_recovery_ops(
-  int max, RecoveryCtx *prctx,
-  ThreadPool::TPHandle &handle,
+  int max, ThreadPool::TPHandle &handle,
   int *ops_started)
 {
   int& started = *ops_started;
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index ab24da4199f1..338abb5aa25d 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -1253,8 +1253,7 @@ protected:
 
   void queue_for_recovery();
   bool start_recovery_ops(
-    int max, RecoveryCtx *prctx,
-    ThreadPool::TPHandle &handle, int *started);
+    int max, ThreadPool::TPHandle &handle, int *started);
 
   int recover_primary(int max, ThreadPool::TPHandle &handle);
   int recover_replicas(int max, ThreadPool::TPHandle &handle);