From patchwork Mon Oct 29 16:34:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10659627 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 343443CF1 for ; Mon, 29 Oct 2018 16:35:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 186B029BAA for ; Mon, 29 Oct 2018 16:35:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CAF229C41; Mon, 29 Oct 2018 16:35:22 +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 AF82929BAA for ; Mon, 29 Oct 2018 16:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728001AbeJ3BYl (ORCPT ); Mon, 29 Oct 2018 21:24:41 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:54408 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727872AbeJ3BYk (ORCPT ); Mon, 29 Oct 2018 21:24:40 -0400 Received: by mail-it1-f195.google.com with SMTP id d6so4706472itl.4 for ; Mon, 29 Oct 2018 09:35:19 -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=xnw8cP0O1dRlxMdVNK9IGnFJqobSJqCE7cER3VDB3d3411hQW43C/V4h4Ef/3LvMrx rSLwUA8uxvZ8SutFn8hRSywytsQIXLa+5Iw4CfnzJE+VZOEYa9ZVojcKRW/p9nSc9iRU 6CFEH09uAd+OHXRrt0aFtWNuHn9qiO5Eyov3X0yzxsJNUJuI1iW8cSemd4cCqW7860dz sFupr0UcF4NzfFt1H/Hdml9Rlabb0EoM7k0TpfF90lMqAkpQ5/ZtQWaW6aE4M8Y3dQFm ZDU3FvDPdlc6FUB4PuFoFRv98gJP6HrTabrXBvM1SNnVgOdQt1+P5fynPSCSzreU7Zix Ottg== 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=dNvrd1TKo/AsRm/6UtR45vQgRe5EfrIdYI2NbF9sK4tr4XokAviyI05f8XXXGx5A+B vB98swq7CsyUs8gh4OrWXq1oiSDMkcr39/0/oo0uYR2chrkGaPvkHkyUO/NBs+DmWpKa WW/wR24E3QCSdKRwQ/Ki5iXtBjyO3Uj8rrHf8xQjX2yL17W9bgx4iBm6IhFgglNLyRCs a8Apd4dRl8+ZlB9QmNYo84vWluA4WRx2I1lK6tnK/ZB2fivt9KSv3mbN+LnVciQP2c6z WCaHhnYB8btc7H9I4zFxuPjGMy0jNUy3Q/rDXMTCQIQdffu6vh5IanJRbQ7tQyEabToU 6G1w== X-Gm-Message-State: AGRZ1gJ6xyQyAYsqjzkxisxCEpuvOEoZbL/yGQyJjaudvb83e1K+Am5j I24rQsZLZYN6LHHfNOj5yZx0QjzEw+c= X-Google-Smtp-Source: AJdET5c5kIzNoGWx5pqbVIv72pSuAG056zvsiAcH1Ooal17WgOayLYsBqDgR6FViYgDys+Hro4URkA== X-Received: by 2002:a24:25c1:: with SMTP id g184-v6mr10443601itg.120.1540830919055; Mon, 29 Oct 2018 09:35:19 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 09:35:17 -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 15/29] block: remove blk_complete_request() Date: Mon, 29 Oct 2018 10:34:30 -0600 Message-Id: <20181029163444.9940-16-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 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 *);