Replace all relevant occurrences of -4 with LEVEL_MULTIPATH

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index a16cafe2c5be0c5f3cbc327faf8e207e79d2cd3d..e1870fc5ab44961654c2d57a6a0d85709da75874 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -683,7 +683,7 @@ int Assemble(struct supertype *st, char *mddev,
                            > devices[most_recent].i.events)
                                most_recent = devcnt;
                }
                            > devices[most_recent].i.events)
                                most_recent = devcnt;
                }

-               if (content->array.level == -4)
+               if (content->array.level == LEVEL_MULTIPATH)

                        /* with multipath, the raid_disk from the superblock is meaningless */
                        i = devcnt;
                else
                        /* with multipath, the raid_disk from the superblock is meaningless */
                        i = devcnt;
                else


@@ -776,7 +776,7 @@ int Assemble(struct supertype *st, char *mddev,
                /* note: we ignore error flags in multipath arrays
                 * as they don't make sense
                 */
                /* note: we ignore error flags in multipath arrays
                 * as they don't make sense
                 */

-               if (content->array.level != -4)
+               if (content->array.level != LEVEL_MULTIPATH)

                        if (!(devices[j].i.disk.state & (1<<MD_DISK_ACTIVE))) {
                                if (!(devices[j].i.disk.state
                                      & (1<<MD_DISK_FAULTY)))
                        if (!(devices[j].i.disk.state & (1<<MD_DISK_ACTIVE))) {
                                if (!(devices[j].i.disk.state
                                      & (1<<MD_DISK_FAULTY)))