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
42 lines
1.0 KiB
Diff
42 lines
1.0 KiB
Diff
From 49948a3561dcd48a94b1c5e98a6d23c9263d1ca3 Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
Date: Thu, 30 Mar 2017 10:46:01 -0400
|
|
Subject: [PATCH] Grow: Do not shadow an existing variable
|
|
|
|
Declaring 'int rv' twice within the same function is asking for
|
|
trouble.
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
---
|
|
Grow.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Grow.c b/Grow.c
|
|
index 0d551ce..0c16d5b 100755
|
|
--- a/Grow.c
|
|
+++ b/Grow.c
|
|
@@ -1834,7 +1834,7 @@ int Grow_reshape(char *devname, int fd,
|
|
* pre-requisite spare devices (mdmon owns final validation)
|
|
*/
|
|
if (st->ss->external) {
|
|
- int rv;
|
|
+ int retval;
|
|
|
|
if (subarray) {
|
|
container = st->container_devnm;
|
|
@@ -1852,9 +1852,9 @@ int Grow_reshape(char *devname, int fd,
|
|
return 1;
|
|
}
|
|
|
|
- rv = st->ss->load_container(st, cfd, NULL);
|
|
+ retval = st->ss->load_container(st, cfd, NULL);
|
|
|
|
- if (rv) {
|
|
+ if (retval) {
|
|
pr_err("Cannot read superblock for %s\n",
|
|
devname);
|
|
free(subarray);
|
|
--
|
|
2.10.2
|
|
|