From patchwork Mon Feb 12 17:34:17 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: 10213629 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 2BAB360467 for ; Mon, 12 Feb 2018 17:34:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E8A228D70 for ; Mon, 12 Feb 2018 17:34:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 137E828DB6; Mon, 12 Feb 2018 17:34:23 +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 7800F28DB5 for ; Mon, 12 Feb 2018 17:34:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753803AbeBLReU (ORCPT ); Mon, 12 Feb 2018 12:34:20 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:20466 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753597AbeBLReT (ORCPT ); Mon, 12 Feb 2018 12:34:19 -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=1518456860; x=1549992860; h=from:to:cc:subject:date:message-id; bh=UhQopNFUuZvKMTCS155zY/IvhMEY9IhmR8RTYRgBT1s=; b=qwN6At7KPdMCtI1m5kUp2uinRZUtFZp5sQfC39Px0edaWp7RPW8/Zd22 tiWijNHO4akx3+9LJX4g92D3XxkXBKJMRLOC8CUmT03dFDZl9WF9sWxaJ PEI2YV6lZs9NcULE4gIWbAJV4tPXwY8J3IQRr/BxLtOcpDoePq2plUCG1 vCWnhCd5SZUSMlBmiOS4bYDSqcxCNOWg9GabwUEqviU/0iFEDgG6l4IXo M4ilD3f6cVHzcvyBzqBQ/g3/2PgAUUi/0ywbT2G9TDUPNKvmQ79CvvyQX efh4GE/QkBIIPWuXpc6t+7XXjCLg4ZdB5xoyxwFGKOz8fCm9VqLgnXP5V Q==; X-IronPort-AV: E=Sophos;i="5.46,503,1511798400"; d="scan'208";a="71725563" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 13 Feb 2018 01:34:19 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 12 Feb 2018 09:28:55 -0800 Received: from thinkpad-bart.sdcorp.global.sandisk.com (HELO thinkpad-bart.int.fusionio.com) ([10.11.171.236]) by uls-op-cesaip01.wdc.com with ESMTP; 12 Feb 2018 09:34:19 -0800 From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Bart Van Assche Subject: [PATCH] block: Reorder the queue flag manipulaton function definitions Date: Mon, 12 Feb 2018 09:34:17 -0800 Message-Id: <20180212173417.15363-1-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.16.1 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 --- 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 9e31df5bb888..321f25c85faa 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -706,6 +706,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) { @@ -738,17 +744,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); @@ -784,6 +779,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);