Received: by 2002:a25:2c96:0:0:0:0:0 with SMTP id s144csp989314ybs; Mon, 25 May 2020 04:33:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZHVjaUdF94qh16IwYgW4Sz4fqyUy6LBSphEfd9/HH94P4R5Rbc2HYane9RCMHD6mEPmF8 X-Received: by 2002:a05:6402:c95:: with SMTP id cm21mr14846348edb.81.1590406389301; Mon, 25 May 2020 04:33:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590406389; cv=none; d=google.com; s=arc-20160816; b=JAgZXciGHH61chRbfWs6LnROcwH+LV4ClG8itoR4vVfQq166CNONn3xvITV96m07Ea 0A6D94rbP74dkBLyLb9JFW5ungPPH+iDDzkJfYHVcoMfLI9roBR4LW1Y3qt7SOhx14c2 t4YwWsO4VIvnb8EEQGVylX3WKoay6/4+rtnu66aHXF5J90BmvR/P+0F+yKD+mWaPZ8iJ V0p9FL5M9BfHsADh+UszcbvqD/r2r2aMrlLwomOJiBFZ+O031pH9wFkXydk0uXyE5P5J SiaroeHrpPLpsl/7GFJlnTASSQi1yDvAzp0frktuamiHkdq/EZ3PfQqq+KJeQHF8NIhe E3pA== 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=fw5qoNWIvYlDufxLZUIYk3ooYiw+HAAPpIvfNFziyDI=; b=zRqQl5hCDwSP1azs5JM/Yt6WWAzRWeUGQEx5n6czcJDuduoUUBkHpVlutph6vsyqQZ 0NtGczMIUyYMh3Q2WJwLdIXMt8Ng5JNe1WcBliWMtq83Z9rxjdUaPf+ZGAsplApnXHkD iR6hVjSv8Q86i4/Oy8rjCmu96cSc8H1iNGOvEOupE64yzBY3MzZUR4VTK5arG1Ev2WQv rYQLD+afzNzFt4Vlkbcnv9IsCob9nGzNd5LTDrYIdm+drVA0pKxYMB3iJkIXuGzdxZ0d IgIE2SRMB4zT7da1E8+5xI/td18hfXfwGhpIkRtaldWYfTjpADplwWy+s2hdaz3Udl5o eBCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=VV45898e; 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 j23si9319026ejm.361.2020.05.25.04.32.46; Mon, 25 May 2020 04:33:09 -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=VV45898e; 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 S2390302AbgEYLaq (ORCPT + 99 others); Mon, 25 May 2020 07:30:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390274AbgEYLaj (ORCPT ); Mon, 25 May 2020 07:30:39 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FAF0C061A0E; Mon, 25 May 2020 04:30:39 -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=fw5qoNWIvYlDufxLZUIYk3ooYiw+HAAPpIvfNFziyDI=; b=VV45898eNCgpFD1E2T5kF890sx Szm2LtSadCf9qBZ2xMpIXI18Cjl7O0bHgePhAFYp+NMyeIqT4v1N+bPU+oJ3DD8dnxXrbsE2y59mC VM4iAlmYqJyVrijZp4h+yZc6OfDR8L/tUa2kBmYB7zIaMknjNFTxmozjZhy2kMIsiTcZtEf69UPW+ MDTFcAKMZATyNPc+dCXvy0cpU15G3JZWZyb/ineSHZyZUsjdn250RKEPd6lZWOn3j/J5kOPv3S+m4 HvVd7frxHtltxEK7kwb4UprVyWQ+BiuJD8585c16RZJp7IN/mJxfA4sRWePZycPlcXnRZRnmDAtUa bukRsn6A==; 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 1jdBJS-0002Pe-MR; Mon, 25 May 2020 11:30:35 +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 06/16] dm: use bio_{start,end}_io_acct Date: Mon, 25 May 2020 13:30:04 +0200 Message-Id: <20200525113014.345997-7-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 Switch dm to use the nicer bio accounting helpers. Signed-off-by: Christoph Hellwig --- drivers/md/dm.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index f215b86664484..3f39fa1ac756e 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -681,11 +681,7 @@ static void start_io_acct(struct dm_io *io) struct mapped_device *md = io->md; struct bio *bio = io->orig_bio; - io->start_time = jiffies; - - generic_start_io_acct(md->queue, bio_op(bio), bio_sectors(bio), - &dm_disk(md)->part0); - + io->start_time = bio_start_io_acct(bio); if (unlikely(dm_stats_used(&md->stats))) dm_stats_account_io(&md->stats, bio_data_dir(bio), bio->bi_iter.bi_sector, bio_sectors(bio), @@ -698,8 +694,7 @@ static void end_io_acct(struct dm_io *io) struct bio *bio = io->orig_bio; unsigned long duration = jiffies - io->start_time; - generic_end_io_acct(md->queue, bio_op(bio), &dm_disk(md)->part0, - io->start_time); + bio_end_io_acct(bio, io->start_time); if (unlikely(dm_stats_used(&md->stats))) dm_stats_account_io(&md->stats, bio_data_dir(bio), -- 2.26.2