From patchwork Fri Jan 8 23:07:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Snitzer X-Patchwork-Id: 7990841 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 728F89F6FA for ; Fri, 8 Jan 2016 23:07:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9E45620138 for ; Fri, 8 Jan 2016 23:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE1FA201C0 for ; Fri, 8 Jan 2016 23:07:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932822AbcAHXHT (ORCPT ); Fri, 8 Jan 2016 18:07:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40295 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932554AbcAHXHP (ORCPT ); Fri, 8 Jan 2016 18:07:15 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 7E4EAC0BB2BB; Fri, 8 Jan 2016 23:07:13 +0000 (UTC) Received: from localhost (dhcp-25-149.bos.redhat.com [10.18.25.149]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u08N7Axu024962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA256 bits=256 verify=NO); Fri, 8 Jan 2016 18:07:11 -0500 Date: Fri, 8 Jan 2016 18:07:10 -0500 From: Mike Snitzer To: Mike Christie Cc: Christoph Hellwig , mchristi@redhat.com, linux-bcache@vger.kernel.org, linux-block@vger.kernel.org, xfs@oss.sgi.com, linux-scsi@vger.kernel.org, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, philipp.reisner@linbit.com, linux-f2fs-devel@lists.sourceforge.net, linux-raid@vger.kernel.org, ocfs2-devel@oss.oracle.com, dm-devel@redhat.com, target-devel@vger.kernel.org, linux-mtd@lists.infradead.org, osd-dev@open-osd.org, linux-fsdevel@vger.kernel.org, lars.ellenberg@linbit.com, linux-ext4@vger.kernel.org, linux-btrfs@vger.kernel.org, drbd-dev@lists.linbit.com Subject: Re: [PATCH 00/35 v2] separate operations from flags in the bio/request structs Message-ID: <20160108230709.GA15655@redhat.com> References: <1452027218-32303-1-git-send-email-mchristi@redhat.com> <20160108133237.GA7663@infradead.org> <56902132.8080008@cs.wisc.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <56902132.8080008@cs.wisc.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Jan 08 2016 at 3:50P -0500, Mike Christie wrote: > On 01/08/2016 07:32 AM, Christoph Hellwig wrote: > > This looks good to me from a highlevel point of view. > > Do you also have a git tree to take a look at all the changes in a > > single big diff? > > I uploaded a git tree here: > > https://github.com/mikechristie/linux-kernel.git > > based off of linux-next today. The patches are just in the master branch. Hi Mike, I had a look at your DM changes. That sucked (but things looked good). So much so that I want to thank you for tackling this task (and taking one for the team). I'll get this kernel built and tested (using the various DM testsuites: lvm2, cryptsetup, device-mapper-test-suite for dm-thinp and dm-cache). But I did make some changes during my review that I'd appreciate if you'd fold in to wherever you think it appropriate in your series: --- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c index 96b5c1b..9e29dba 100644 --- a/drivers/md/dm-stats.c +++ b/drivers/md/dm-stats.c @@ -514,11 +514,10 @@ static void dm_stat_round(struct dm_stat *s, struct dm_stat_shared *shared, } static void dm_stat_for_entry(struct dm_stat *s, size_t entry, - unsigned long bi_rw, sector_t len, + int idx, sector_t len, struct dm_stats_aux *stats_aux, bool end, unsigned long duration_jiffies) { - unsigned long idx = bi_rw; struct dm_stat_shared *shared = &s->stat_shared[entry]; struct dm_stat_percpu *p; @@ -584,7 +583,7 @@ static void dm_stat_for_entry(struct dm_stat *s, size_t entry, #endif } -static void __dm_stat_bio(struct dm_stat *s, unsigned long bi_rw, +static void __dm_stat_bio(struct dm_stat *s, int bi_rw, sector_t bi_sector, sector_t end_sector, bool end, unsigned long duration_jiffies, struct dm_stats_aux *stats_aux) @@ -622,7 +621,7 @@ static void __dm_stat_bio(struct dm_stat *s, unsigned long bi_rw, } while (unlikely(todo != 0)); } -void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw, +void dm_stats_account_io(struct dm_stats *stats, int bi_rw, sector_t bi_sector, unsigned bi_sectors, bool end, unsigned long duration_jiffies, struct dm_stats_aux *stats_aux) diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 5e940f7..9a4b3cb 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1326,7 +1326,7 @@ static int device_fua_capable(struct dm_target *ti, struct dm_dev *dev, } static bool dm_table_supports_flush(struct dm_table *t, - iterate_devices_callout_fn support_test) + iterate_devices_callout_fn callout_fn) { struct dm_target *ti; unsigned i = 0; @@ -1347,7 +1347,7 @@ static bool dm_table_supports_flush(struct dm_table *t, return true; if (ti->type->iterate_devices && - ti->type->iterate_devices(ti, support_test, NULL)) + ti->type->iterate_devices(ti, callout_fn, NULL)) return true; }