diff options
author | Andre Noll <maan@systemlinux.org> | 2008-07-11 08:02:20 -0400 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2008-07-11 08:02:20 -0400 |
commit | 05710466c9ef2e3ee55166934c801a2393c32f80 (patch) | |
tree | a0560ff7920fcb4de9af3b054dc40033b429701f | |
parent | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (diff) |
md: Simplify uuid_equal().
Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r-- | drivers/md/md.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 73399d17ac3e..8a03c953b887 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -543,17 +543,12 @@ fail: | |||
543 | 543 | ||
544 | static int uuid_equal(mdp_super_t *sb1, mdp_super_t *sb2) | 544 | static int uuid_equal(mdp_super_t *sb1, mdp_super_t *sb2) |
545 | { | 545 | { |
546 | if ( (sb1->set_uuid0 == sb2->set_uuid0) && | 546 | return sb1->set_uuid0 == sb2->set_uuid0 && |
547 | (sb1->set_uuid1 == sb2->set_uuid1) && | 547 | sb1->set_uuid1 == sb2->set_uuid1 && |
548 | (sb1->set_uuid2 == sb2->set_uuid2) && | 548 | sb1->set_uuid2 == sb2->set_uuid2 && |
549 | (sb1->set_uuid3 == sb2->set_uuid3)) | 549 | sb1->set_uuid3 == sb2->set_uuid3; |
550 | |||
551 | return 1; | ||
552 | |||
553 | return 0; | ||
554 | } | 550 | } |
555 | 551 | ||
556 | |||
557 | static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2) | 552 | static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2) |
558 | { | 553 | { |
559 | int ret; | 554 | int ret; |