From ed2075e5194a360d40fec4d52b9e5d989249f538 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Sun, 25 Sep 2011 23:26:17 +0100 Subject: [PATCH] --- yaml --- r: 264275 b: refs/heads/master c: 876fbba1db4a377f050a2bb49b474c7527b2995d h: refs/heads/master i: 264273: c9b31c21c2cb79c6b198084bab1723bba7f7e9c3 264271: 309e18e9a27fd66fed36414f17c4e5932e8831df v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-table.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0ff29dcdb4a3..7855e976c14c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68e58a294fb26f692697179e3f3ecf88dd8cb97c +refs/heads/master: 876fbba1db4a377f050a2bb49b474c7527b2995d diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c index 986b8754bb08..322669807077 100644 --- a/trunk/drivers/md/dm-table.c +++ b/trunk/drivers/md/dm-table.c @@ -1238,14 +1238,15 @@ static void dm_table_set_integrity(struct dm_table *t) return; template_disk = dm_table_get_integrity_disk(t, true); - if (!template_disk && - blk_integrity_is_initialized(dm_disk(t->md))) { + if (template_disk) + blk_integrity_register(dm_disk(t->md), + blk_get_integrity(template_disk)); + else if (blk_integrity_is_initialized(dm_disk(t->md))) DMWARN("%s: device no longer has a valid integrity profile", dm_device_name(t->md)); - return; - } - blk_integrity_register(dm_disk(t->md), - blk_get_integrity(template_disk)); + else + DMWARN("%s: unable to establish an integrity profile", + dm_device_name(t->md)); } static int device_flush_capable(struct dm_target *ti, struct dm_dev *dev,