Browse Source

md: Simplify uuid_equal().

Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: Neil Brown <neilb@suse.de>
Andre Noll 17 years ago
parent
commit
05710466c9
1 changed files with 4 additions and 9 deletions
  1. 4 9
      drivers/md/md.c

+ 4 - 9
drivers/md/md.c

@@ -543,17 +543,12 @@ fail:
 
 
 static int uuid_equal(mdp_super_t *sb1, mdp_super_t *sb2)
 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)
 static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2)
 {
 {
 	int ret;
 	int ret;