From 48d9bae116866478c3a285a65a37dbd30e9cec73 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Fri, 21 Dec 2012 20:23:32 +0000 Subject: [PATCH] --- yaml --- r: 347947 b: refs/heads/master c: 018debea8de9b8f17a9637e07c98c61517eb2a6b h: refs/heads/master i: 347945: 6a7f897752a24afb391b3766cc33be3e28a1074b 347943: 5d41052ed92f64a51d7426740b4936ee2633a17a v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-thin.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 552daf4ded63..993956f13452 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3cbf94513c21516fbb44561857b155d1c599625 +refs/heads/master: 018debea8de9b8f17a9637e07c98c61517eb2a6b diff --git a/trunk/drivers/md/dm-thin.c b/trunk/drivers/md/dm-thin.c index aeb9e20f5978..063fe04e60e9 100644 --- a/trunk/drivers/md/dm-thin.c +++ b/trunk/drivers/md/dm-thin.c @@ -2391,7 +2391,9 @@ static int pool_status(struct dm_target *ti, status_type_t type, else DMEMIT("rw "); - if (pool->pf.discard_enabled && pool->pf.discard_passdown) + if (!pool->pf.discard_enabled) + DMEMIT("ignore_discard"); + else if (pool->pf.discard_passdown) DMEMIT("discard_passdown"); else DMEMIT("no_discard_passdown"); @@ -2487,7 +2489,7 @@ static struct target_type pool_target = { .name = "thin-pool", .features = DM_TARGET_SINGLETON | DM_TARGET_ALWAYS_WRITEABLE | DM_TARGET_IMMUTABLE, - .version = {1, 5, 0}, + .version = {1, 6, 0}, .module = THIS_MODULE, .ctr = pool_ctr, .dtr = pool_dtr,