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=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 0AA87C04AA6 for ; Tue, 30 Apr 2019 16:11:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFA4A21670 for ; Tue, 30 Apr 2019 16:11:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="GSbiqm5l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725950AbfD3QLJ (ORCPT ); Tue, 30 Apr 2019 12:11:09 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:53504 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbfD3QLI (ORCPT ); Tue, 30 Apr 2019 12:11:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ak1psogB3+UehdV/Lop9XeHTygydQPlIz0taFZzsWAw=; b=GSbiqm5lJCTKPQqQUsRBOFaha XB1qPKdw5zX4Sm6hEGO9a8ZATSclpShxFQtmFM9yjxsk8wV2qHmKLU/jnoQxJIK15xQxS/Y0wNw4J nqZJbK7syb5i8gyeFDyf6DaMH9I7+QUQs5vShjQSh1NOfhzDq10sWDRCz5p0VhwSrWYtH8qGt/SwS WG3u+rtnKRHxszJtoNLWf2sxZCYbTWyJLTY/DGQCgBSJgWGbr0Ev9W15Bu1GaaCfACa+FBED9+qPM u2LP+CWXYpwBBjlwZReUXndvYTEcLk9pL2O3klukb8m21Nshm8UNqO5TNSC9oxblZZSjpEYH3ut2Q FAzMAnTrw==; Received: from adsl-173-228-226-134.prtc.net ([173.228.226.134] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLVLX-0005i5-Ts; Tue, 30 Apr 2019 16:11:08 +0000 From: Christoph Hellwig To: axboe@kernel.dk Cc: linux-block@vger.kernel.org Subject: [PATCH] block: remove the unused blk_queue_dma_pad function Date: Tue, 30 Apr 2019 12:10:30 -0400 Message-Id: <20190430161030.23150-1-hch@lst.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Signed-off-by: Christoph Hellwig --- block/bio.c | 2 +- block/blk-settings.c | 16 ---------------- include/linux/blkdev.h | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/block/bio.c b/block/bio.c index 029afb121a48..22da218fbcda 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1576,7 +1576,7 @@ static void bio_copy_kern_endio_read(struct bio *bio) * device. Returns an error pointer in case of error. */ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, - gfp_t gfp_mask, int reading) + gfp_t gfp_mask, int reading, struct bio **biop) { unsigned long kaddr = (unsigned long)data; unsigned long end = (kaddr + len + PAGE_SIZE - 1) >> PAGE_SHIFT; diff --git a/block/blk-settings.c b/block/blk-settings.c index 6375afaedcec..e8889e48b032 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -662,22 +662,6 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, } EXPORT_SYMBOL(disk_stack_limits); -/** - * blk_queue_dma_pad - set pad mask - * @q: the request queue for the device - * @mask: pad mask - * - * Set dma pad mask. - * - * Appending pad buffer to a request modifies the last entry of a - * scatter list such that it includes the pad buffer. - **/ -void blk_queue_dma_pad(struct request_queue *q, unsigned int mask) -{ - q->dma_pad_mask = mask; -} -EXPORT_SYMBOL(blk_queue_dma_pad); - /** * blk_queue_update_dma_pad - update pad mask * @q: the request queue for the device diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 99aa98f60b9e..bd3e3f09bfa0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1069,7 +1069,6 @@ extern int bdev_stack_limits(struct queue_limits *t, struct block_device *bdev, extern void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, sector_t offset); extern void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b); -extern void blk_queue_dma_pad(struct request_queue *, unsigned int); extern void blk_queue_update_dma_pad(struct request_queue *, unsigned int); extern int blk_queue_dma_drain(struct request_queue *q, dma_drain_needed_fn *dma_drain_needed, -- 2.20.1