Received: by 2002:a25:2c96:0:0:0:0:0 with SMTP id s144csp1273316ybs; Mon, 25 May 2020 11:28:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSMqPPe5nv8gFCBwrHRh+okKACmp/cUTVgReSXoHignPKsrj4b9xRXw/2LJU92Wmrdd6yb X-Received: by 2002:a17:906:144e:: with SMTP id q14mr20223653ejc.450.1590431287242; Mon, 25 May 2020 11:28:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590431287; cv=none; d=google.com; s=arc-20160816; b=tFt3OIAodRX6BRwQl1xy3blbYvxojtz5tqdaGWQCYNZOxi6Lojg46KY/q3qiJlv3ZI rqgG3VCR/wmM1ZU3bfWAF13Qh7eWjQJAqDYVzWFAwGMWEnUpDXDdMzZ+IVOa5Xeepsih 7JQASQHMUGC1cVrOL9T4CmqUpIAW3zVb9iJ+K5H6dhZI1LncPVGx4nXSKSuUyJlZNTfc 6r1mWwghWYK/9rwbpyIyPfwL0zr2DR2T7MaNUZClA4aTjO1vxpmrZo6DQ1lPRvag9QUs bYxoyiV78/LNwLt2JcoxtH4/OsrkX6HssfAXIZh7iFG60sG6KiA/oI0kd3jCkGtQ5etJ cC5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wbcYGu4K/KvxacmDugnY1JTDIf2EUIs/D5pC9nxMDLM=; b=nXfuHbrdUPfnvO3D7Y7YsPLahZiTTeYttI/mhuKtGE24aiCBD9sn7+HcgfdXYeeC3w 1Ke5RsEs2ObDjVOtqLKVHaZUfKCNdfNiQ0gLI/VV6fvk1uLvrnEJC0bFzWNEO077y1Ju bbk6mciMzCocPzqoq7D+7x+vOaNib6yhCx2yllWzKXxfrLuGmQ1VvQcE4NY3R844cmK5 cH+FaKzVHLjP4yHKK20BOKUi5lQruAS42+j9elsvKFat8e90ZOUAvEbeoL4BrzAx+YEX aOwmR33f3Q4hmXIoLOnu9DZpu6WJ5V/MnuFcgUuw85AZeeGbK4ZLf46cry+WYYjAoJZV YJMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=m3rcJKXu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m24si9610675eji.423.2020.05.25.11.27.44; Mon, 25 May 2020 11:28:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=m3rcJKXu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390325AbgEYLav (ORCPT + 99 others); Mon, 25 May 2020 07:30:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390311AbgEYLat (ORCPT ); Mon, 25 May 2020 07:30:49 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EB7FC061A0E; Mon, 25 May 2020 04:30:49 -0700 (PDT) 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:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=wbcYGu4K/KvxacmDugnY1JTDIf2EUIs/D5pC9nxMDLM=; b=m3rcJKXu3f5VY654ncYBSutrTI wnscZBs/n1Ysd2FFJ7s/pYOP2UADelGdu4zs5P5ewRa35yharvn7oB45NNAjhtP4zzDmwBWU3QVwt q1Pn5R6Mq9XkZmEr+Caj/GxwAjdahzol5+k3U2NZKlzg6IuIjUKcUS+Hnxh1gb4nraTYoybmBG3tc fl+97Oiin0l9WtwsdkM9zDb6ViFeuDluuLoYWtDvxhzl99xl8rNycY1B0azdi0TuqaUYwsqm67z9X vst/1/XwBPFZt4HTyXGLchwBAVA60M2eQGaW7CQUmkIraNWqCEr5+iJKfyv1AzpQdJNRh8o402U8W IH2ELDHw==; Received: from [2001:4bb8:18c:5da7:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdBJb-0002TN-JH; Mon, 25 May 2020 11:30:44 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Konstantin Khlebnikov , Minchan Kim , Nitin Gupta , dm-devel@redhat.com, linux-block@vger.kernel.org, drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/16] block: remove generic_{start,end}_io_acct Date: Mon, 25 May 2020 13:30:07 +0200 Message-Id: <20200525113014.345997-10-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200525113014.345997-1-hch@lst.de> References: <20200525113014.345997-1-hch@lst.de> 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove these now unused functions. Signed-off-by: Christoph Hellwig --- block/bio.c | 39 --------------------------------------- include/linux/bio.h | 6 ------ 2 files changed, 45 deletions(-) diff --git a/block/bio.c b/block/bio.c index 9c101a0572ca2..3e89c7b37855a 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1392,45 +1392,6 @@ void update_io_ticks(struct hd_struct *part, unsigned long now, bool end) } } -void generic_start_io_acct(struct request_queue *q, int op, - unsigned long sectors, struct hd_struct *part) -{ - const int sgrp = op_stat_group(op); - int rw = op_is_write(op); - - part_stat_lock(); - - update_io_ticks(part, jiffies, false); - part_stat_inc(part, ios[sgrp]); - part_stat_add(part, sectors[sgrp], sectors); - part_stat_local_inc(part, in_flight[rw]); - if (part->partno) - part_stat_local_inc(&part_to_disk(part)->part0, in_flight[rw]); - - part_stat_unlock(); -} -EXPORT_SYMBOL(generic_start_io_acct); - -void generic_end_io_acct(struct request_queue *q, int req_op, - struct hd_struct *part, unsigned long start_time) -{ - unsigned long now = jiffies; - unsigned long duration = now - start_time; - const int sgrp = op_stat_group(req_op); - int rw = op_is_write(req_op); - - part_stat_lock(); - - update_io_ticks(part, now, true); - part_stat_add(part, nsecs[sgrp], jiffies_to_nsecs(duration)); - part_stat_local_dec(part, in_flight[rw]); - if (part->partno) - part_stat_local_dec(&part_to_disk(part)->part0, in_flight[rw]); - - part_stat_unlock(); -} -EXPORT_SYMBOL(generic_end_io_acct); - static inline bool bio_remaining_done(struct bio *bio) { /* diff --git a/include/linux/bio.h b/include/linux/bio.h index 950c9dc44c4f2..941378ec5b39f 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -444,12 +444,6 @@ void bio_release_pages(struct bio *bio, bool mark_dirty); extern void bio_set_pages_dirty(struct bio *bio); extern void bio_check_pages_dirty(struct bio *bio); -void generic_start_io_acct(struct request_queue *q, int op, - unsigned long sectors, struct hd_struct *part); -void generic_end_io_acct(struct request_queue *q, int op, - struct hd_struct *part, - unsigned long start_time); - extern void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter, struct bio *src, struct bvec_iter *src_iter); extern void bio_copy_data(struct bio *dst, struct bio *src); -- 2.26.2