From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 327EBCD1297 for ; Fri, 5 Apr 2024 04:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9LweEZrmiKVerICmVmLtnk/UJt1X5V5M1gIfDbMOSmc=; b=HG0M4uIJ4wyPRVi5h7wOsZAYK6 Q4OTPldQJZjps8rE/qpWttS9ynNeo4uYixCYDyVsMoohBU5pdCCc1DgrqjLtvfXFQwJISSeBHM8V+ N4kMcBnsDXmpyBfaTq3d5ZIkTSG1nsA/WEWfclF8tOPHILK8KvNynBuzpNNLNfm6f2zX/g+RknZBI e6Ab11H3f7092Y557wauZOS9mFKF8gBG/gWRjm68yU0sQ3mHFhwBMiyKhn6sm94Pi7ZtcfToB+nuA GPG4Zdrlc23hA8b+sbU9uDbB97Ir1u9iElTOJh8qZnKu0CkJGJGBN4lQAY63eTf5PtR+QnXg0JdyC N1shggog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsbPE-00000005BEj-2Apr; Fri, 05 Apr 2024 04:42:24 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsbP9-00000005B9R-0yT7 for linux-nvme@lists.infradead.org; Fri, 05 Apr 2024 04:42:21 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 4ECEDCE35DD; Fri, 5 Apr 2024 04:42:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5561C433B2; Fri, 5 Apr 2024 04:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712292136; bh=Psfl/jmWSX5gl8cykLhLSXQA1aPpWSzL1AVZwTM+VIc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=HUL8/poB3QOW7waEYho9vvystJ0O3nU3TAUP8SbPmpQ1d+udWUTMvZvXGO9bU0Xf+ nO8CMRMNAKFS0+WeB/QUqbbi8L9yXRhsOTl1SuAn/gu7WA1FrTcREfaujTQxjSwKir dVidztx/46eTtRqPWG1biOtZ3ND6zyfKNxNEW8+bm8F8r8MDekN61ytQq77fijeHDR rGw6itKrcMLhlVdDdXkZaSSxoVwfwud0mvogp6JFOqkZGAJklozJN8vkwYHW337n0X bZx5Tahj61lHmGtU1+L2S4HD4bZVc4+oqpt4WGJ6SwFm36TBu1nSgtrhBvkd6TKECE E8MDgQ6f8AwUQ== From: Damien Le Moal To: linux-block@vger.kernel.org, Jens Axboe , linux-scsi@vger.kernel.org, "Martin K . Petersen" , dm-devel@lists.linux.dev, Mike Snitzer , linux-nvme@lists.infradead.org, Keith Busch , Christoph Hellwig Subject: [PATCH v6 05/28] block: Allow using bio_attempt_back_merge() internally Date: Fri, 5 Apr 2024 13:41:44 +0900 Message-ID: <20240405044207.1123462-6-dlemoal@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405044207.1123462-1-dlemoal@kernel.org> References: <20240405044207.1123462-1-dlemoal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240404_214219_570068_B14BDD73 X-CRM114-Status: GOOD ( 12.28 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Remove "static" from the definition of bio_attempt_back_merge() and declare this function in block/blk.h to allow using it internally from other block layer files. The definition of enum bio_merge_status is also moved to block/blk.h. Signed-off-by: Damien Le Moal Reviewed-by: Hannes Reinecke Reviewed-by: Bart Van Assche Reviewed-by: Christoph Hellwig Tested-by: Hans Holmberg --- block/blk-merge.c | 8 +------- block/blk.h | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 4e3483a16b75..3363b1321908 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -972,13 +972,7 @@ static void blk_account_io_merge_bio(struct request *req) part_stat_unlock(); } -enum bio_merge_status { - BIO_MERGE_OK, - BIO_MERGE_NONE, - BIO_MERGE_FAILED, -}; - -static enum bio_merge_status bio_attempt_back_merge(struct request *req, +enum bio_merge_status bio_attempt_back_merge(struct request *req, struct bio *bio, unsigned int nr_segs) { const blk_opf_t ff = bio_failfast(bio); diff --git a/block/blk.h b/block/blk.h index 17786052f32d..bca50a9510c8 100644 --- a/block/blk.h +++ b/block/blk.h @@ -269,6 +269,14 @@ static inline void bio_integrity_free(struct bio *bio) unsigned long blk_rq_timeout(unsigned long timeout); void blk_add_timer(struct request *req); +enum bio_merge_status { + BIO_MERGE_OK, + BIO_MERGE_NONE, + BIO_MERGE_FAILED, +}; + +enum bio_merge_status bio_attempt_back_merge(struct request *req, + struct bio *bio, unsigned int nr_segs); bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, unsigned int nr_segs); bool blk_bio_list_merge(struct request_queue *q, struct list_head *list, -- 2.44.0