On Fri, Jan 08 2016 at 3:50P -0500, Mike Christie <michaelc@xxxxxxxxxxx> 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: 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html