From patchwork Mon Oct 29 16:34:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10659603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BB61713B5 for ; Mon, 29 Oct 2018 16:35:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A101329C40 for ; Mon, 29 Oct 2018 16:35:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94F9B29C46; Mon, 29 Oct 2018 16:35:13 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable 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 399BE29C40 for ; Mon, 29 Oct 2018 16:35:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727988AbeJ3BYc (ORCPT ); Mon, 29 Oct 2018 21:24:32 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:52340 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727973AbeJ3BYa (ORCPT ); Mon, 29 Oct 2018 21:24:30 -0400 Received: by mail-it1-f195.google.com with SMTP id r5-v6so8313946ith.2 for ; Mon, 29 Oct 2018 09:35:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=H2/u2BSk9uW8SPj3X4Tu8Bc7rWbnZ8paQV+CWAQKD4Y=; b=PaZwn5rNZCsNx3lLSf8udHJxAyfcqt4vWs+Of7PtsNxx0H+eViJ9CsBW2xN++GqU+H hkifiOXrhn1ogOdLKTaqSjS3ihCvZOFJBs5rhi1cKXSpf4nqTrqI7AM31GYJbHve92Iv 65us4a/L/fyatGywXeRd4kq24gJvLkZhZn8/M4lrICkvpp6dYu7meqKBabpTiNnOn2HW dD41IeMgOoF2wuHWS/2k0qVdbuzHYwOjmjEEeXsBy52pNNVOLkQrDZIyV2zeLJNKPcat F2sQSonQC8HZkf8yGcfjqiSQ6CvFrCywVYsYisW7y0wKiowtQeUkKCy1oJ8NDyV627wi ArtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=H2/u2BSk9uW8SPj3X4Tu8Bc7rWbnZ8paQV+CWAQKD4Y=; b=g1cye+RAOKUOXP27pltLyGKYysDjctNh9yIMZeQy9wXfNSo7yZymU7yyho7U3Wca76 eKKSqOP1P+3xrr5hhIoF1BY89EKaGFu8PwfDhPlWTre/h5u1Yfh7ltXqaUdAlavw7o3F QQVW3AN9A4Po+2ZjjbMkF20BH4faLp+eYXGmWs15dIxEgiwniBKmBUL72smMI+BKITB2 1LRVSXP1PY7NnMTI3pjpzkArp7lf+DoXffXZhOGsouxomWXWX85WgdVSz5IuESXb3FwH utwuTLAa2cEuChnWoQtAhJDOSU+XglmYHeyoLO06+lhNRBkTE87paLt3tYjfWlZ5ADHi 4W6g== X-Gm-Message-State: AGRZ1gJn0IW4QFHjb0Yxv1M+PsrryNXErpKG3wrGzJc0yc3V0xF8V9ti rPQwSMFylgFxO1OtaNilLBVRgXuB+uw= X-Google-Smtp-Source: AJdET5e9tFRDygu9OReCrVRfpbRZ06SIBCIgNkUWCXaes5BHxJlKg2qskV6ClHn+zvKC+g96RtSIFQ== X-Received: by 2002:a02:90c1:: with SMTP id c1-v6mr10960355jag.127.1540830909150; Mon, 29 Oct 2018 09:35:09 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id n7-v6sm6464500itb.22.2018.10.29.09.35.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 09:35:07 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 10/29] block: remove q->lld_busy_fn() Date: Mon, 29 Oct 2018 10:34:25 -0600 Message-Id: <20181029163444.9940-11-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181029163444.9940-1-axboe@kernel.dk> References: <20181029163444.9940-1-axboe@kernel.dk> 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 Nobody is using the legacy path for blk_lld_busy() anymore, remove it. Signed-off-by: Jens Axboe Reviewed-by: Hannes Reinecke --- block/blk-core.c | 2 -- block/blk-settings.c | 6 ------ include/linux/blkdev.h | 3 --- 3 files changed, 11 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index c99088d0e80b..5044a1c41493 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -3427,8 +3427,6 @@ EXPORT_SYMBOL_GPL(rq_flush_dcache_pages); */ int blk_lld_busy(struct request_queue *q) { - if (q->lld_busy_fn) - return q->lld_busy_fn(q); if (q->mq_ops && q->mq_ops->busy) return q->mq_ops->busy(q); diff --git a/block/blk-settings.c b/block/blk-settings.c index ffd459969689..82b31fb2888c 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -73,12 +73,6 @@ void blk_queue_rq_timed_out(struct request_queue *q, rq_timed_out_fn *fn) } EXPORT_SYMBOL_GPL(blk_queue_rq_timed_out); -void blk_queue_lld_busy(struct request_queue *q, lld_busy_fn *fn) -{ - q->lld_busy_fn = fn; -} -EXPORT_SYMBOL_GPL(blk_queue_lld_busy); - /** * blk_set_default_limits - reset limits to default values * @lim: the queue_limits structure to reset diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4293dc1cd160..e867733b761d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -320,7 +320,6 @@ typedef void (unprep_rq_fn) (struct request_queue *, struct request *); struct bio_vec; typedef void (softirq_done_fn)(struct request *); typedef int (dma_drain_needed_fn)(struct request *); -typedef int (lld_busy_fn) (struct request_queue *q); typedef int (bsg_job_fn) (struct bsg_job *); typedef int (init_rq_fn)(struct request_queue *, struct request *, gfp_t); typedef void (exit_rq_fn)(struct request_queue *, struct request *); @@ -466,7 +465,6 @@ struct request_queue { softirq_done_fn *softirq_done_fn; rq_timed_out_fn *rq_timed_out_fn; dma_drain_needed_fn *dma_drain_needed; - lld_busy_fn *lld_busy_fn; /* Called just after a request is allocated */ init_rq_fn *init_rq_fn; /* Called just before a request is freed */ @@ -1255,7 +1253,6 @@ 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, void *buf, unsigned int size); -extern void blk_queue_lld_busy(struct request_queue *q, lld_busy_fn *fn); extern void blk_queue_segment_boundary(struct request_queue *, unsigned long); extern void blk_queue_virt_boundary(struct request_queue *, unsigned long); extern void blk_queue_prep_rq(struct request_queue *, prep_rq_fn *pfn);