You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
2.5 KiB
86 lines
2.5 KiB
2 months ago
|
From da4d58b6d01ed8b0149b777eba7818861fde8c80 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mateusz Kusiak <mateusz.kusiak@intel.com>
|
||
|
|
Date: Tue, 19 Mar 2024 11:15:29 +0100
|
||
|
|
Subject: [PATCH 41/41] 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>
|
||
|
|
---
|
||
|
|
Build.c | 6 ------
|
||
|
|
Grow.c | 13 +------------
|
||
|
|
super1.c | 11 -----------
|
||
|
|
3 files changed, 1 insertion(+), 29 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Build.c b/Build.c
|
||
|
|
index 1fbf8596..1be90e41 100644
|
||
|
|
--- a/Build.c
|
||
|
|
+++ b/Build.c
|
||
|
|
@@ -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,
|
||
|
|
diff --git a/Grow.c b/Grow.c
|
||
|
|
index c69a342d..074f1995 100644
|
||
|
|
--- a/Grow.c
|
||
|
|
+++ b/Grow.c
|
||
|
|
@@ -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;
|
||
|
|
diff --git a/super1.c b/super1.c
|
||
|
|
index 5439b7bb..81d29a65 100644
|
||
|
|
--- a/super1.c
|
||
|
|
+++ b/super1.c
|
||
|
|
@@ -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++) {
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|