From 71b5e34f0c4262f38bf6330e198f6033ebf58881 Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Mon, 28 Mar 2011 20:09:12 -0400
Subject: [PATCH] --- yaml --- r: 243230 b: refs/heads/master c:
 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/md.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f5d2e84ce4b9..1a3e5732b5f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7de8e5737df31a6826015a65135ed8f0a32bb2c4
+refs/heads/master: 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 06ecea751a39..8b66e04c2ea6 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -1777,12 +1777,6 @@ int md_integrity_register(mddev_t *mddev)
 			continue;
 		if (rdev->raid_disk < 0)
 			continue;
-		/*
-		 * If at least one rdev is not integrity capable, we can not
-		 * enable data integrity for the md device.
-		 */
-		if (!bdev_get_integrity(rdev->bdev))
-			return -EINVAL;
 		if (!reference) {
 			/* Use the first rdev as the reference */
 			reference = rdev;
@@ -1793,6 +1787,8 @@ int md_integrity_register(mddev_t *mddev)
 				rdev->bdev->bd_disk) < 0)
 			return -EINVAL;
 	}
+	if (!reference || !bdev_get_integrity(reference->bdev))
+		return 0;
 	/*
 	 * All component devices are integrity capable and have matching
 	 * profiles, register the common profile for the md device.