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>

diff --git a/Build.c b/Build.c
index 1fbf8596a9dd3d8786e411bfe4f1ce99cc83c62a..1be90e418ad1f1e6d9890e19c94a15cac93d24f7 100644 (file)
--- 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 c69a342df945723671455e364354f2b9359323f9..074f19956e17a4568a254a23b2f6d615068c8727 100644 (file)
--- 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 5439b7bb1240a6dde9122bff1b0033eb75fe374e..81d29a652f3645d7596c7026716b2e596aafd701 100644 (file)
--- 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++) {