From: Sage Weil <sage@redhat.com>
Date: Wed, 13 Sep 2017 21:00:12 +0000 (-0400)
Subject: osd/PG: inline lock_suspend_timeout
X-Git-Tag: v13.0.1~634^2~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1893d24c205280b7be6dee56b7f454ed5207030;p=ceph.git

osd/PG: inline lock_suspend_timeout

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 8e259b5802ac..b73916563430 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -348,13 +348,6 @@ PG::~PG()
 #endif
 }
 
-void PG::lock_suspend_timeout(ThreadPool::TPHandle &handle)
-{
-  handle.suspend_tp_timeout();
-  lock();
-  handle.reset_tp_timeout();
-}
-
 void PG::lock(bool no_lockdep) const
 {
   _lock.Lock(no_lockdep);
diff --git a/src/osd/PG.h b/src/osd/PG.h
index cbf97df7ac10..7cf44431c880 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -314,7 +314,12 @@ public:
 
   ZTracer::Endpoint trace_endpoint;
 
-  void lock_suspend_timeout(ThreadPool::TPHandle &handle);
+  void lock_suspend_timeout(ThreadPool::TPHandle &handle) {
+    handle.suspend_tp_timeout();
+    lock();
+    handle.reset_tp_timeout();
+  }
+
   void lock(bool no_lockdep = false) const;
   void unlock() const {
     //generic_dout(0) << this << " " << info.pgid << " unlock" << dendl;