From: Andre Noll <maan@systemlinux.org>
Date: Fri, 11 Jul 2008 12:02:20 +0000 (+1000)
Subject: md: Simplify uuid_equal().
X-Git-Tag: v2.6.27-rc1~957^2~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=05710466c9ef2e3ee55166934c801a2393c32f80;p=linux-2.6-omap-h63xx.git

md: Simplify uuid_equal().

Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 73399d17ac3..8a03c953b88 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -543,17 +543,12 @@ fail:
 
 static int uuid_equal(mdp_super_t *sb1, mdp_super_t *sb2)
 {
-	if (	(sb1->set_uuid0 == sb2->set_uuid0) &&
-		(sb1->set_uuid1 == sb2->set_uuid1) &&
-		(sb1->set_uuid2 == sb2->set_uuid2) &&
-		(sb1->set_uuid3 == sb2->set_uuid3))
-
-		return 1;
-
-	return 0;
+	return 	sb1->set_uuid0 == sb2->set_uuid0 &&
+		sb1->set_uuid1 == sb2->set_uuid1 &&
+		sb1->set_uuid2 == sb2->set_uuid2 &&
+		sb1->set_uuid3 == sb2->set_uuid3;
 }
 
-
 static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2)
 {
 	int ret;