1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
From 9cf361f8791d86aaced821c19af556819bc03732 Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <jsorensen@fb.com>
|
|
Date: Wed, 27 Nov 2019 11:33:15 -0500
|
|
Subject: [PATCH] Fix up a few formatting issues
|
|
Git-commit: 9cf361f8791d86aaced821c19af556819bc03732
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
Manage.c | 13 +++++++++----
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Manage.c b/Manage.c
|
|
index deeba2b..b22c396 100644
|
|
--- a/Manage.c
|
|
+++ b/Manage.c
|
|
@@ -1728,8 +1728,10 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)
|
|
int fd2 = open(from_devname, O_RDONLY);
|
|
|
|
if (fd1 < 0 || fd2 < 0) {
|
|
- if (fd1>=0) close(fd1);
|
|
- if (fd2>=0) close(fd2);
|
|
+ if (fd1 >= 0)
|
|
+ close(fd1);
|
|
+ if (fd2 >= 0)
|
|
+ close(fd2);
|
|
return 0;
|
|
}
|
|
|
|
@@ -1743,7 +1745,8 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)
|
|
devlist.disposition = 'r';
|
|
if (Manage_subdevs(from_devname, fd2, &devlist, -1, 0, NULL, 0) == 0) {
|
|
devlist.disposition = 'a';
|
|
- if (Manage_subdevs(to_devname, fd1, &devlist, -1, 0, NULL, 0) == 0) {
|
|
+ if (Manage_subdevs(to_devname, fd1, &devlist, -1, 0,
|
|
+ NULL, 0) == 0) {
|
|
/* make sure manager is aware of changes */
|
|
ping_manager(to_devname);
|
|
ping_manager(from_devname);
|
|
@@ -1751,7 +1754,9 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)
|
|
close(fd2);
|
|
return 1;
|
|
}
|
|
- else Manage_subdevs(from_devname, fd2, &devlist, -1, 0, NULL, 0);
|
|
+ else
|
|
+ Manage_subdevs(from_devname, fd2, &devlist,
|
|
+ -1, 0, NULL, 0);
|
|
}
|
|
close(fd1);
|
|
close(fd2);
|
|
--
|
|
2.25.0
|
|
|