Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68359C46466 for ; Tue, 6 Oct 2020 07:07:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BEFA020760 for ; Tue, 6 Oct 2020 07:07:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="vgjiBSig" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727143AbgJFHH1 (ORCPT ); Tue, 6 Oct 2020 03:07:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727117AbgJFHH0 (ORCPT ); Tue, 6 Oct 2020 03:07:26 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19BC6C061755 for ; Tue, 6 Oct 2020 00:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=aPBmv+O69ihed5UuZR+x5KtVXVLpLm3Yt1NX1zge5vk=; b=vgjiBSigX7+QS/L/BhXkLIbpZC ty4X0U2WxWVb6oMNo5LSNbw3nd/R76+JSTrw/yXKDT00L9ESKLlx2lZf+0WBe7t/42PtKtZqD2pxk 530FKAOlFGmZWd8R/l3wF00vAW+b0BkfP+e7SEetQAuO2qbDCBFN56Dd6L413POxAs4klW4ku3fdH r2nlrO748eCFkjo7ybPK9qg3pSARuI4IdABfdN1wmJGqKbnV/iZVvAhlRvQjRIPZt1K42rNVZBmLa iHTMWvQiwOqABcbwyIY64XbHQdB72mbuzlcDrnQGamjd03DtACOzjJer6Z4U+T8UxYpWN8lQb+3AI 5Q6uqvmw==; Received: from [2001:4bb8:184:92a2:9ae2:c87f:2c64:2882] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kPh4E-0002X8-Jn; Tue, 06 Oct 2020 07:07:22 +0000 From: Christoph Hellwig To: Jens Axboe Cc: "Martin K. Petersen" , linux-block@vger.kernel.org Subject: [PATCH 1/3] block: remove the unused blk_integrity_merge_rq export Date: Tue, 6 Oct 2020 09:07:17 +0200 Message-Id: <20201006070719.427627-2-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201006070719.427627-1-hch@lst.de> References: <20201006070719.427627-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Also move the definition from the public blkdev.h to the private block/blk.h header. Signed-off-by: Christoph Hellwig --- block/blk-integrity.c | 1 - block/blk.h | 8 ++++++++ include/linux/blkdev.h | 8 -------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 2b36a8f9b81390..a262e069eb3fe6 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -183,7 +183,6 @@ bool blk_integrity_merge_rq(struct request_queue *q, struct request *req, return true; } -EXPORT_SYMBOL(blk_integrity_merge_rq); bool blk_integrity_merge_bio(struct request_queue *q, struct request *req, struct bio *bio) diff --git a/block/blk.h b/block/blk.h index c08762e10b0470..ba4e8ac538cdc7 100644 --- a/block/blk.h +++ b/block/blk.h @@ -120,6 +120,9 @@ static inline bool bio_integrity_endio(struct bio *bio) return true; } +bool blk_integrity_merge_rq(struct request_queue *, struct request *, + struct request *); + static inline bool integrity_req_gap_back_merge(struct request *req, struct bio *next) { @@ -143,6 +146,11 @@ static inline bool integrity_req_gap_front_merge(struct request *req, void blk_integrity_add(struct gendisk *); void blk_integrity_del(struct gendisk *); #else /* CONFIG_BLK_DEV_INTEGRITY */ +static inline bool blk_integrity_merge_rq(struct request_queue *rq, + struct request *r1, struct request *r2) +{ + return true; +} static inline bool integrity_req_gap_back_merge(struct request *req, struct bio *next) { diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index cf80e61b4c5e1a..1c01e724659273 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1663,8 +1663,6 @@ extern int blk_integrity_compare(struct gendisk *, struct gendisk *); extern int blk_rq_map_integrity_sg(struct request_queue *, struct bio *, struct scatterlist *); extern int blk_rq_count_integrity_sg(struct request_queue *, struct bio *); -extern bool blk_integrity_merge_rq(struct request_queue *, struct request *, - struct request *); extern bool blk_integrity_merge_bio(struct request_queue *, struct request *, struct bio *); @@ -1794,12 +1792,6 @@ static inline unsigned short queue_max_integrity_segments(const struct request_q { return 0; } -static inline bool blk_integrity_merge_rq(struct request_queue *rq, - struct request *r1, - struct request *r2) -{ - return true; -} static inline bool blk_integrity_merge_bio(struct request_queue *rq, struct request *r, struct bio *b) -- 2.28.0