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.
76 lines
2.8 KiB
76 lines
2.8 KiB
From cf622ec1d81a5bb3f882922667bac494b3a16581 Mon Sep 17 00:00:00 2001 |
|
From: Jes Sorensen <Jes.Sorensen@gmail.com> |
|
Date: Wed, 5 Apr 2017 11:53:12 -0400 |
|
Subject: [RHEL7.5 PATCH 050/169] Create: Fixup bad placement of logical || |
|
&& in multi-line if statements |
|
|
|
These always go at the end of the line, never at the front |
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com> |
|
--- |
|
Create.c | 28 +++++++++++----------------- |
|
1 file changed, 11 insertions(+), 17 deletions(-) |
|
|
|
diff --git a/Create.c b/Create.c |
|
index ba24606..17333ce 100644 |
|
--- a/Create.c |
|
+++ b/Create.c |
|
@@ -457,8 +457,8 @@ int Create(struct supertype *st, char *mddev, |
|
st->minor_version >= 1) |
|
/* metadata at front */ |
|
warn |= check_partitions(fd, dname, 0, 0); |
|
- else if (s->level == 1 || s->level == LEVEL_CONTAINER |
|
- || (s->level == 0 && s->raiddisks == 1)) |
|
+ else if (s->level == 1 || s->level == LEVEL_CONTAINER || |
|
+ (s->level == 0 && s->raiddisks == 1)) |
|
/* partitions could be meaningful */ |
|
warn |= check_partitions(fd, dname, freesize*2, s->size*2); |
|
else |
|
@@ -495,9 +495,8 @@ int Create(struct supertype *st, char *mddev, |
|
pr_err("no size and no drives given - aborting create.\n"); |
|
return 1; |
|
} |
|
- if (s->level > 0 || s->level == LEVEL_MULTIPATH |
|
- || s->level == LEVEL_FAULTY |
|
- || st->ss->external ) { |
|
+ if (s->level > 0 || s->level == LEVEL_MULTIPATH || |
|
+ s->level == LEVEL_FAULTY || st->ss->external ) { |
|
/* size is meaningful */ |
|
if (!st->ss->validate_geometry(st, s->level, s->layout, |
|
s->raiddisks, |
|
@@ -616,8 +615,8 @@ int Create(struct supertype *st, char *mddev, |
|
* it could be in conflict with already existing device |
|
* e.g. container, array |
|
*/ |
|
- if (strncmp(chosen_name, "/dev/md/", 8) == 0 |
|
- && map_by_name(&map, chosen_name+8) != NULL) { |
|
+ if (strncmp(chosen_name, "/dev/md/", 8) == 0 && |
|
+ map_by_name(&map, chosen_name+8) != NULL) { |
|
pr_err("Array name %s is in use already.\n", |
|
chosen_name); |
|
close(mdfd); |
|
@@ -653,16 +652,11 @@ int Create(struct supertype *st, char *mddev, |
|
info.array.md_minor = minor(stb.st_rdev); |
|
info.array.not_persistent = 0; |
|
|
|
- if ( ( (s->level == 4 || s->level == 5) && |
|
- (insert_point < s->raiddisks || first_missing < s->raiddisks) ) |
|
- || |
|
- ( s->level == 6 && (insert_point < s->raiddisks |
|
- || second_missing < s->raiddisks)) |
|
- || |
|
- ( s->level <= 0 ) |
|
- || |
|
- s->assume_clean |
|
- ) { |
|
+ if (((s->level == 4 || s->level == 5) && |
|
+ (insert_point < s->raiddisks || first_missing < s->raiddisks)) || |
|
+ (s->level == 6 && (insert_point < s->raiddisks || |
|
+ second_missing < s->raiddisks)) || |
|
+ (s->level <= 0) || s->assume_clean) { |
|
info.array.state = 1; /* clean, but one+ drive will be missing*/ |
|
info.resync_start = MaxSector; |
|
} else { |
|
-- |
|
2.7.4 |
|
|
|
|