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
100 lines
3.0 KiB
Diff
100 lines
3.0 KiB
Diff
From efa295309fd2d85133aaf3c224cd5834b689234c Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
Date: Wed, 29 Mar 2017 12:05:12 -0400
|
|
Subject: [PATCH] util: Cosmetic changes
|
|
|
|
Fixup a number of indentation and whitespace issues
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
util.c | 22 ++++++++++------------
|
|
1 file changed, 10 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/util.c b/util.c
|
|
index 683c869..374015e 100644
|
|
--- a/util.c
|
|
+++ b/util.c
|
|
@@ -828,14 +828,12 @@ char *human_size(long long bytes)
|
|
long cMiB = (bytes * 200LL / (1LL<<20) + 1) / 2;
|
|
long cMB = (bytes / ( 1000000LL / 200LL ) +1) /2;
|
|
snprintf(buf, sizeof(buf), " (%ld.%02ld MiB %ld.%02ld MB)",
|
|
- cMiB/100 , cMiB % 100,
|
|
- cMB/100, cMB % 100);
|
|
+ cMiB/100, cMiB % 100, cMB/100, cMB % 100);
|
|
} else {
|
|
long cGiB = (bytes * 200LL / (1LL<<30) +1) / 2;
|
|
long cGB = (bytes / (1000000000LL/200LL ) +1) /2;
|
|
snprintf(buf, sizeof(buf), " (%ld.%02ld GiB %ld.%02ld GB)",
|
|
- cGiB/100 , cGiB % 100,
|
|
- cGB/100, cGB % 100);
|
|
+ cGiB/100, cGiB % 100, cGB/100, cGB % 100);
|
|
}
|
|
return buf;
|
|
}
|
|
@@ -862,22 +860,22 @@ char *human_size_brief(long long bytes, int prefix)
|
|
if (bytes < 2*1024LL*1024LL*1024LL) {
|
|
long cMiB = (bytes * 200LL / (1LL<<20) +1) /2;
|
|
snprintf(buf, sizeof(buf), "%ld.%02ldMiB",
|
|
- cMiB/100 , cMiB % 100);
|
|
+ cMiB/100, cMiB % 100);
|
|
} else {
|
|
long cGiB = (bytes * 200LL / (1LL<<30) +1) /2;
|
|
snprintf(buf, sizeof(buf), "%ld.%02ldGiB",
|
|
- cGiB/100 , cGiB % 100);
|
|
+ cGiB/100, cGiB % 100);
|
|
}
|
|
}
|
|
else if (prefix == JEDEC) {
|
|
if (bytes < 2*1024LL*1024LL*1024LL) {
|
|
long cMB = (bytes / ( 1000000LL / 200LL ) +1) /2;
|
|
snprintf(buf, sizeof(buf), "%ld.%02ldMB",
|
|
- cMB/100, cMB % 100);
|
|
+ cMB/100, cMB % 100);
|
|
} else {
|
|
long cGB = (bytes / (1000000000LL/200LL ) +1) /2;
|
|
snprintf(buf, sizeof(buf), "%ld.%02ldGB",
|
|
- cGB/100 , cGB % 100);
|
|
+ cGB/100, cGB % 100);
|
|
}
|
|
}
|
|
else
|
|
@@ -1093,7 +1091,7 @@ int open_dev_excl(char *devnm)
|
|
long delay = 1000;
|
|
|
|
sprintf(buf, "%d:%d", major(devid), minor(devid));
|
|
- for (i = 0 ; i < 25 ; i++) {
|
|
+ for (i = 0; i < 25; i++) {
|
|
int fd = dev_open(buf, flags|O_EXCL);
|
|
if (fd >= 0)
|
|
return fd;
|
|
@@ -1134,7 +1132,7 @@ void wait_for(char *dev, int fd)
|
|
(stb_want.st_mode & S_IFMT) != S_IFBLK)
|
|
return;
|
|
|
|
- for (i = 0 ; i < 25 ; i++) {
|
|
+ for (i = 0; i < 25; i++) {
|
|
struct stat stb;
|
|
if (stat(dev, &stb) == 0 &&
|
|
(stb.st_mode & S_IFMT) == S_IFBLK &&
|
|
@@ -1205,7 +1203,7 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
|
|
verstr = "-no-metadata-";
|
|
}
|
|
|
|
- for (i = 0; st == NULL && superlist[i] ; i++)
|
|
+ for (i = 0; st == NULL && superlist[i]; i++)
|
|
st = superlist[i]->match_metadata_desc(verstr);
|
|
|
|
sysfs_free(sra);
|
|
@@ -1270,7 +1268,7 @@ struct supertype *guess_super_type(int fd, enum guess_types guess_type)
|
|
st = xcalloc(1, sizeof(*st));
|
|
st->container_devnm[0] = 0;
|
|
|
|
- for (i = 0 ; superlist[i]; i++) {
|
|
+ for (i = 0; superlist[i]; i++) {
|
|
int rv;
|
|
ss = superlist[i];
|
|
if (guess_type == guess_array && ss->add_to_super == NULL)
|
|
--
|
|
2.10.2
|
|
|