diff options
author | Mateusz Kusiak <mateusz.kusiak@intel.com> | 2024-03-19 11:15:29 +0100 |
---|---|---|
committer | Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> | 2024-03-22 12:21:46 +0100 |
commit | da4d58b6d01ed8b0149b777eba7818861fde8c80 (patch) | |
tree | 0357bd866e7e33765ce3c5e336ad910b0e6846f1 | |
parent | ae996e81232b8ba991e763dfa15577a0af358358 (diff) | |
download | mdadm-da4d58b6d01ed8b0149b777eba7818861fde8c80.tar.gz |
Remove all "if zeros" pt.2
Commit e15e8b00cbce ("Remove all "if zeros"") did not remove all "if 0"
code blocks.
This commit is cleanup for that commit.
Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
-rw-r--r-- | Build.c | 6 | ||||
-rw-r--r-- | Grow.c | 13 | ||||
-rw-r--r-- | super1.c | 11 |
3 files changed, 1 insertions, 29 deletions
@@ -156,12 +156,6 @@ int Build(struct mddev_ident *ident, struct mddev_dev *devlist, struct shape *s, bitmap_fd = open(s->bitmap_file, O_RDWR); if (bitmap_fd < 0) { int major = BITMAP_MAJOR_HI; -#if 0 - if (s->bitmap_chunk == UnSet) { - pr_err("%s cannot be opened.\n", s->bitmap_file); - goto abort; - } -#endif bitmapsize = s->size >> 9; /* FIXME wrong for RAID10 */ if (CreateBitmap(s->bitmap_file, 1, NULL, s->bitmap_chunk, c->delay, @@ -4413,19 +4413,8 @@ static void validate(int afd, int bfd, unsigned long long offset) lseek64(afd, __le64_to_cpu(bsb2.arraystart)*512, 0); if ((unsigned long long)read(afd, abuf, len) != len) fail("read first from array failed"); - if (memcmp(bbuf, abuf, len) != 0) { -#if 0 - int i; - printf("offset=%llu len=%llu\n", - (unsigned long long)__le64_to_cpu(bsb2.arraystart)*512, len); - for (i=0; i<len; i++) - if (bbuf[i] != abuf[i]) { - printf("first diff byte %d\n", i); - break; - } -#endif + if (memcmp(bbuf, abuf, len) != 0) fail("data1 compare failed"); - } } if (bsb2.length2) { unsigned long long len = __le64_to_cpu(bsb2.length2)*512; @@ -575,17 +575,6 @@ static void examine_super1(struct supertype *st, char *homehost) inconsistent = 1; } } -#if 0 - /* This is confusing too */ - faulty = 0; - for (i = 0; i < __le32_to_cpu(sb->max_dev); i++) { - int role = __le16_to_cpu(sb->dev_roles[i]); - if (role == MD_DISK_ROLE_FAULTY) - faulty++; - } - if (faulty) - printf(" %d failed", faulty); -#endif printf(" ('A' == active, '.' == missing, 'R' == replacing)"); printf("\n"); for (d = 0; d < __le32_to_cpu(sb->max_dev); d++) { |