From patchwork Wed Jun 22 18:26:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 906742 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5MIR01Q022113 for ; Wed, 22 Jun 2011 18:27:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758021Ab1FVS1A (ORCPT ); Wed, 22 Jun 2011 14:27:00 -0400 Received: from sentry-two.sandia.gov ([132.175.109.14]:53393 "EHLO sentry-two.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758533Ab1FVS07 (ORCPT ); Wed, 22 Jun 2011 14:26:59 -0400 X-WSS-ID: 0LN7F8X-0B-4K7-02 X-M-MSG: Received: from interceptor2.sandia.gov (interceptor2.sandia.gov [132.175.109.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sentry-two.sandia.gov (Postfix) with ESMTP id 10887173223 for ; Wed, 22 Jun 2011 12:26:57 -0600 (MDT) Received: from sentry.sandia.gov (mm03snlnto.sandia.gov [132.175.109.20]) by interceptor2.sandia.gov (RSA Interceptor) for ; Wed, 22 Jun 2011 12:26:48 -0600 Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Wed, 22 Jun 2011 12:26:35 -0600 X-Server-Uuid: AF72F651-81B1-4134-BA8C-A8E1A4E620FF Received: from skynetrps1.sandia.gov (skynetrps1.sandia.gov [134.253.138.1]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id p5MIQD0h013685; Wed, 22 Jun 2011 12:26:15 -0600 From: "Jim Schutt" To: ceph-devel@vger.kernel.org cc: "Jim Schutt" Subject: [PATCH 1/3] common/Throttle: Remove unused return type on Throttle::get() Date: Wed, 22 Jun 2011 12:26:25 -0600 Message-ID: <1308767187-10376-3-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1308767187-10376-1-git-send-email-jaschut@sandia.gov> References: <1308767187-10376-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.6.22.182114 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_700_799 0, DATE_TZ_NA 0, __ANY_URI 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20110622182636; ID=1; SEV=2.3.1; DFV=B2011062218; IFV=NA; AIF=B2011062218; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230392E34453032333344442E303033383A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2011062218_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 621CEC514FO1662318-01-01 X-RSA-Inspected: yes X-RSA-Classifications: public X-RSA-Action: allow Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Jun 2011 18:27:02 +0000 (UTC) Signed-off-by: Jim Schutt --- src/common/Throttle.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/Throttle.h b/src/common/Throttle.h index cd772dd..8fd2625 100644 --- a/src/common/Throttle.h +++ b/src/common/Throttle.h @@ -68,16 +68,15 @@ public: return count; } - bool get(int64_t c = 1, int64_t m = 0) { + void get(int64_t c = 1, int64_t m = 0) { assert(c >= 0); Mutex::Locker l(lock); if (m) { assert(m > 0); _reset_max(m); } - bool waited = _wait(c); + _wait(c); count += c; - return waited; } /* Returns true if it successfully got the requested amount,