From: Yehuda Sadeh <yehuda@redhat.com>
Date: Sat, 2 Aug 2014 20:01:05 +0000 (-0700)
Subject: rgw: need to pass need_to_wait for throttle_data()
X-Git-Tag: v0.80.6~93
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=439bce34bc25cd7c8eba7ffc124185d810d3711f;p=ceph.git

rgw: need to pass need_to_wait for throttle_data()

need_to_wait wasn't passed into processor->throttle_data(). This was
broken in fix for #8937.

CID 1229541:    (PW.PARAM_SET_BUT_NOT_USED)

Backport: firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e93818df33286a2a7f73b593dc20da412db4e0a6)
(cherry picked from commit 8519e9ab06caf6999e1243514a93eaffb155ab2e)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index c43ca146701f..76947480bb4f 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1582,7 +1582,7 @@ static int put_data_and_throttle(RGWPutObjProcessor *processor, bufferlist& data
       hash = NULL; /* only calculate hash once */
     }
 
-    ret = processor->throttle_data(handle, false);
+    ret = processor->throttle_data(handle, need_to_wait);
     if (ret < 0)
       return ret;