From patchwork Thu Oct 25 21:10: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: 10656541 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 3382517F3 for ; Thu, 25 Oct 2018 21:11:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27D0E2C648 for ; Thu, 25 Oct 2018 21:11:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C6862C650; Thu, 25 Oct 2018 21:11:14 +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=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 B0B4A2C648 for ; Thu, 25 Oct 2018 21:11:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727461AbeJZFpb (ORCPT ); Fri, 26 Oct 2018 01:45:31 -0400 Received: from mail-io1-f68.google.com ([209.85.166.68]:46690 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726149AbeJZFpa (ORCPT ); Fri, 26 Oct 2018 01:45:30 -0400 Received: by mail-io1-f68.google.com with SMTP id y22-v6so6389071ioj.13 for ; Thu, 25 Oct 2018 14:11:12 -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=lFi3ytuVwN23tjINSpp8EPlFQdzwD3G97ZaSk+3bfAk=; b=z93nXnT2FCA3o4tiaSYfayrYH1DieVmuBlLSpNpPIDbSIffHq4novG5jXB9UnbUBa2 QDq3nk96T9h0GLihXCHqU8d3fWQEnwKIz5voYY5dehCGyeU6bpOrB2kEUqBR4HmXJ60C 5tD4xF6lRwVitl+FBAV2RsOZ/EqsSyhtG0VNfRUe2yD7OSCr63rR//VuOJDjck6lpeIu ZMwKkjVJJzoqhYFVNTvfSBxNLrFSgeCuScqlnGvgG1X+6VqWwizT56Xxik1zUMD0nWUm NPmw1+HQOi7A/dB+N3SdW8M51toD3EQ1SILQMYP7gUCHNV2IYJkadajX6140D4Fd8JwK K/hQ== 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=lFi3ytuVwN23tjINSpp8EPlFQdzwD3G97ZaSk+3bfAk=; b=PZDrJxrCkLcRTRZ1mRM5WiLDEeeqZ1Zz+mOGzd/j3PiabT7GjdhqNWPa+1ZfkOZ9pN S4e0ILrkP6VBxQt5o++PKYotnRxBodUTvIjz6uvzbvoLkfKNX74W/TLxaOB2QofnCM1Q h3N3sDFdgibwDyz0LzneX9oJQS8bTDZG8QUjZJDRMkERovXMUKYwJwArV9Y31gKRt4zc +PCX1O0MDvQTmW2eWrVu00P8V4ucJF3oVj0ej5eTJt6Id0SRqOPwXWzDmMZXFOtvatUl D29EGLKLBKvxv5LyiphTYfGzdrQnyk/SFeUwg1T6mnT5TTwlRsrc+0YUnC60cTt1w/rO P54Q== X-Gm-Message-State: AGRZ1gLEKfevmhutbLTl0sFSUzVmoYu1g5CuwTrNfKQMykYi7Y0G1eyR Dulhcqnb38RnAjFnfjOtc9ku5w== X-Google-Smtp-Source: AJdET5cwjyApAV7wfedhBGXMkZYmK980z4UGO7C5tD+YjCEU7fQq8YptflfrSrD4i2sgdpKHmVkiyg== X-Received: by 2002:a5e:c114:: with SMTP id v20-v6mr594824iol.155.1540501871842; Thu, 25 Oct 2018 14:11:11 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id e65-v6sm3446375ioa.76.2018.10.25.14.11.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Oct 2018 14:11:10 -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 14/28] block: remove blk_complete_request() Date: Thu, 25 Oct 2018 15:10:25 -0600 Message-Id: <20181025211039.11559-15-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025211039.11559-1-axboe@kernel.dk> References: <20181025211039.11559-1-axboe@kernel.dk> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's now unused. Signed-off-by: Jens Axboe Reviewed-by: Hannes Reinecke --- block/blk-softirq.c | 20 -------------------- include/linux/blkdev.h | 1 - 2 files changed, 21 deletions(-) diff --git a/block/blk-softirq.c b/block/blk-softirq.c index e47a2f751884..8ca0f6caf174 100644 --- a/block/blk-softirq.c +++ b/block/blk-softirq.c @@ -145,26 +145,6 @@ void __blk_complete_request(struct request *req) } EXPORT_SYMBOL(__blk_complete_request); -/** - * blk_complete_request - end I/O on a request - * @req: the request being processed - * - * Description: - * Ends all I/O on a request. It does not handle partial completions, - * unless the driver actually implements this in its completion callback - * through requeueing. The actual completion happens out-of-order, - * through a softirq handler. The user must have registered a completion - * callback through blk_queue_softirq_done(). - **/ -void blk_complete_request(struct request *req) -{ - if (unlikely(blk_should_fake_timeout(req->q))) - return; - if (!blk_mark_rq_complete(req)) - __blk_complete_request(req); -} -EXPORT_SYMBOL(blk_complete_request); - static __init int blk_softirq_init(void) { int i; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4293dc1cd160..9ff9ab6fc1fe 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1205,7 +1205,6 @@ extern bool __blk_end_request(struct request *rq, blk_status_t error, extern void __blk_end_request_all(struct request *rq, blk_status_t error); extern bool __blk_end_request_cur(struct request *rq, blk_status_t error); -extern void blk_complete_request(struct request *); extern void __blk_complete_request(struct request *); extern void blk_abort_request(struct request *); extern void blk_unprep_request(struct request *);