From patchwork Thu Mar 8 01:10:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10265751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ADAF060247 for ; Thu, 8 Mar 2018 01:10:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0009295F2 for ; Thu, 8 Mar 2018 01:10:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94D79295F4; Thu, 8 Mar 2018 01:10:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7DC6295F3 for ; Thu, 8 Mar 2018 01:10:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754997AbeCHBKO (ORCPT ); Wed, 7 Mar 2018 20:10:14 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:51958 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754967AbeCHBKN (ORCPT ); Wed, 7 Mar 2018 20:10:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1520471413; x=1552007413; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=e6AAHXRXYatqpznCD46U56dWxLltjSF2z/FUuBuxVP4=; b=RDDniZSC+/pDghBM2DUtRgJD1NNz+2OApFL3YnpglFNxuro+sa4+AeQl NkubU0hjxais1L+dVq90nm8rcQNMgYNbLwdkPYhz8AOX65oYeUrx/cR+M IIKBA03pYkCxT0jiM2xLg6MNEa7nht0CWJIY6r+VnhFciesdog2Ml3fJK /QAjZ2oaGjEYLv1RRWFcVs+qGJfavYF1JMqkNouPu4OTKA2U2Fp/S0gvj zXper//GtHYkBZlDW+35ehPYEzrQsEyrgwSGev5fNkYJ67CAH6rsVecEg e93B4WwqmB7+cprz3NJsvhZiylXsb5snFiu9gN3GKT0KMwnYf+7QKEnch g==; X-IronPort-AV: E=Sophos;i="5.47,438,1515427200"; d="scan'208";a="72999156" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Mar 2018 09:10:13 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP; 07 Mar 2018 17:04:03 -0800 Received: from thinkpad-bart.sdcorp.global.sandisk.com (HELO thinkpad-bart.int.fusionio.com) ([10.11.171.236]) by uls-op-cesaip02.wdc.com with ESMTP; 07 Mar 2018 17:10:14 -0800 From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Bart Van Assche , Hannes Reinecke , Ming Lei Subject: [PATCH v2 01/11] block: Reorder the queue flag manipulation function definitions Date: Wed, 7 Mar 2018 17:10:02 -0800 Message-Id: <20180308011012.31522-2-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180308011012.31522-1-bart.vanassche@wdc.com> References: <20180308011012.31522-1-bart.vanassche@wdc.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the definition of queue_flag_clear_unlocked() up and move the definition of queue_in_flight() down such that all queue flag manipulation function definitions become contiguous. This patch does not change any functionality. Signed-off-by: Bart Van Assche Reviewed-by: Johannes Thumshirn Reviewed-by: Martin K. Petersen Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Ming Lei --- include/linux/blkdev.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9becac7432d0..e1e2a06559dc 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -724,6 +724,12 @@ static inline void queue_flag_set_unlocked(unsigned int flag, __set_bit(flag, &q->queue_flags); } +static inline void queue_flag_clear_unlocked(unsigned int flag, + struct request_queue *q) +{ + __clear_bit(flag, &q->queue_flags); +} + static inline int queue_flag_test_and_clear(unsigned int flag, struct request_queue *q) { @@ -756,17 +762,6 @@ static inline void queue_flag_set(unsigned int flag, struct request_queue *q) __set_bit(flag, &q->queue_flags); } -static inline void queue_flag_clear_unlocked(unsigned int flag, - struct request_queue *q) -{ - __clear_bit(flag, &q->queue_flags); -} - -static inline int queue_in_flight(struct request_queue *q) -{ - return q->in_flight[0] + q->in_flight[1]; -} - static inline void queue_flag_clear(unsigned int flag, struct request_queue *q) { queue_lockdep_assert_held(q); @@ -802,6 +797,11 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q) extern int blk_set_preempt_only(struct request_queue *q); extern void blk_clear_preempt_only(struct request_queue *q); +static inline int queue_in_flight(struct request_queue *q) +{ + return q->in_flight[0] + q->in_flight[1]; +} + static inline bool blk_account_rq(struct request *rq) { return (rq->rq_flags & RQF_STARTED) && !blk_rq_is_passthrough(rq);