850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
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: [PATCH] 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.12.0
|
|
|