---

yaml
---
r: 264275
b: refs/heads/master
c: 876fbba
h: refs/heads/master
i:
  264273: c9b31c2
  264271: 309e18e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68e58a294fb26f692697179e3f3ecf88dd8cb97c
+refs/heads/master: 876fbba1db4a377f050a2bb49b474c7527b2995d

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,