From patchwork Wed Oct 31 17:59:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10663083 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 77E271751 for ; Wed, 31 Oct 2018 17:59:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6791B2B4D5 for ; Wed, 31 Oct 2018 17:59:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5721C2B4DC; Wed, 31 Oct 2018 17:59:58 +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 F401B2B4D3 for ; Wed, 31 Oct 2018 17:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730025AbeKAC7A (ORCPT ); Wed, 31 Oct 2018 22:59:00 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:34774 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730188AbeKAC7A (ORCPT ); Wed, 31 Oct 2018 22:59:00 -0400 Received: by mail-io1-f67.google.com with SMTP id d80-v6so10349395iof.1 for ; Wed, 31 Oct 2018 10:59:56 -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=nGFUKkJorzZ2OccxLOjg4Eyx9GGMXKzcV2g7CTUjhGs=; b=cAm5ujFcJfiPj7g+e6lVFNFcGLFusmNXoGPtxyFILDmKeWLa6WyO0uJCZxSiWywQXX WcenUJGoWdGgZZsmvCmePnA+3yRAqb6x8Pk6iJnKnm2hDWbuX7O8gbUzEnPCjlqjZuWx 9i0+FDIeg5OktI1hn/vvJBBf4YdDEkx6iFXUlyYCB08CFrzg+C+pZRJymgx83WutXA4d FSoTJKzWgvV/0zByhu60Rr0hlgsTOOlGkQzNNbKZdjP5MctJ8dQpoiHX9s+Xam2bR2C3 GQ7jhvl/OrBERctdoSWApJerDI8C75PY8pPuIP9ybA0RsSIgl6liY+oIVHVfCdc7BHUR /LWw== 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=nGFUKkJorzZ2OccxLOjg4Eyx9GGMXKzcV2g7CTUjhGs=; b=BIonrfYyw8y29zgPbsdNqHY9Q1pdPp9Wn9YfjvFKQhnBUklXWZ3Fm2YQxUxzAPis2y 0FtvrPdG8Wky+dmcpgz+oMq1YxHhzitd2ASrTnlq/RQE378M/S4Q/NksJmy4FQjUCdxc vRoC8wcBBDexa1ckF8dEb1V00DtMR4eMSL+lu84DmRyDaYWpzQnoAa4S+pOfOkcknOFK XUpHCvgX3g4WnfDaEjqsNUwjBRtlEClsmyIQ739hxPKlS2tRt9N0IGn7bleyBrv1sZdx J6n3ZWqq2Lv+rRdhsdeoSO2V1Dp3/ZxCFymSGpVd52MrsToZFEcf70Ab7HjsbsWuCtOP g8Xw== X-Gm-Message-State: AGRZ1gJPwXFwps8vVrmg7atKTYdkUkw+PVB1oNEajo7/oMx1jabv4zY3 o9zbRVIiSBCB9ESDZIjDaIHirfoz4d8= X-Google-Smtp-Source: AJdET5cGKeRHHN604t/RuzszkTxpsF2OAGlT36WdyXA2HhPapZEgvF9MDYKUsEPRf+WNxrj8uv9D/g== X-Received: by 2002:a6b:f614:: with SMTP id n20-v6mr2936583ioh.259.1541008795917; Wed, 31 Oct 2018 10:59:55 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id 197-v6sm10982947iou.87.2018.10.31.10.59.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 10:59:54 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 15/30] block: remove blk_complete_request() Date: Wed, 31 Oct 2018 11:59:07 -0600 Message-Id: <20181031175922.8849-16-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031175922.8849-1-axboe@kernel.dk> References: <20181031175922.8849-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 It's now unused. Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe --- 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 e867733b761d..6baea6563364 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1203,7 +1203,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 *);