diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-01-31 05:50:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-01-31 05:50:23 +0000 |
| commit | ae1d23c826fb3bdc59ba6b0fd64e63b7444f02b6 (patch) | |
| tree | f4e9c8932fa94f04eacf2118964bf3a54e5ecfe6 /Build.c | |
| parent | Releasing debian version 4.2+20231121-1. (diff) | |
| download | mdadm-ae1d23c826fb3bdc59ba6b0fd64e63b7444f02b6.tar.xz mdadm-ae1d23c826fb3bdc59ba6b0fd64e63b7444f02b6.zip | |
Merging upstream version 4.2+20240118.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'Build.c')
| -rw-r--r-- | Build.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -82,7 +82,7 @@ int Build(struct mddev_ident *ident, struct mddev_dev *devlist, struct shape *s, return 1; } - map_update(&map, fd2devnm(mdfd), "none", uuid, chosen_name); + map_update(&map, fd2devnm(mdfd), STR_COMMON_NONE, uuid, chosen_name); map_unlock(&map); array.level = s->level; @@ -111,7 +111,7 @@ int Build(struct mddev_ident *ident, struct mddev_dev *devlist, struct shape *s, goto abort; } - if (s->bitmap_file && strcmp(s->bitmap_file, "none") == 0) + if (s->bitmap_file && str_is_none(s->bitmap_file) == true) s->bitmap_file = NULL; if (s->bitmap_file && s->level <= 0) { pr_err("bitmaps not meaningful with level %s\n", |