|
 |
2910d5 |
From 9cf361f8791d86aaced821c19af556819bc03732 Mon Sep 17 00:00:00 2001
|
|
|
2910d5 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
2910d5 |
Date: Wed, 27 Nov 2019 11:33:15 -0500
|
|
|
2910d5 |
Subject: [RHEL8.2 PATCH 50/61] Fix up a few formatting issues
|
|
|
2910d5 |
|
|
|
2910d5 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
2910d5 |
---
|
|
|
2910d5 |
Manage.c | 13 +++++++++----
|
|
|
2910d5 |
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
2910d5 |
|
|
|
2910d5 |
diff --git a/Manage.c b/Manage.c
|
|
|
2910d5 |
index deeba2b..b22c396 100644
|
|
|
2910d5 |
--- a/Manage.c
|
|
|
2910d5 |
+++ b/Manage.c
|
|
|
2910d5 |
@@ -1728,8 +1728,10 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)
|
|
|
2910d5 |
int fd2 = open(from_devname, O_RDONLY);
|
|
|
2910d5 |
|
|
|
2910d5 |
if (fd1 < 0 || fd2 < 0) {
|
|
|
2910d5 |
- if (fd1>=0) close(fd1);
|
|
|
2910d5 |
- if (fd2>=0) close(fd2);
|
|
|
2910d5 |
+ if (fd1 >= 0)
|
|
|
2910d5 |
+ close(fd1);
|
|
|
2910d5 |
+ if (fd2 >= 0)
|
|
|
2910d5 |
+ close(fd2);
|
|
|
2910d5 |
return 0;
|
|
|
2910d5 |
}
|
|
|
2910d5 |
|
|
|
2910d5 |
@@ -1743,7 +1745,8 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)
|
|
|
2910d5 |
devlist.disposition = 'r';
|
|
|
2910d5 |
if (Manage_subdevs(from_devname, fd2, &devlist, -1, 0, NULL, 0) == 0) {
|
|
|
2910d5 |
devlist.disposition = 'a';
|
|
|
2910d5 |
- if (Manage_subdevs(to_devname, fd1, &devlist, -1, 0, NULL, 0) == 0) {
|
|
|
2910d5 |
+ if (Manage_subdevs(to_devname, fd1, &devlist, -1, 0,
|
|
|
2910d5 |
+ NULL, 0) == 0) {
|
|
|
2910d5 |
/* make sure manager is aware of changes */
|
|
|
2910d5 |
ping_manager(to_devname);
|
|
|
2910d5 |
ping_manager(from_devname);
|
|
|
2910d5 |
@@ -1751,7 +1754,9 @@ int move_spare(char *from_devname, char *to_devname, dev_t devid)
|
|
|
2910d5 |
close(fd2);
|
|
|
2910d5 |
return 1;
|
|
|
2910d5 |
}
|
|
|
2910d5 |
- else Manage_subdevs(from_devname, fd2, &devlist, -1, 0, NULL, 0);
|
|
|
2910d5 |
+ else
|
|
|
2910d5 |
+ Manage_subdevs(from_devname, fd2, &devlist,
|
|
|
2910d5 |
+ -1, 0, NULL, 0);
|
|
|
2910d5 |
}
|
|
|
2910d5 |
close(fd1);
|
|
|
2910d5 |
close(fd2);
|
|
|
2910d5 |
--
|
|
|
2910d5 |
2.7.5
|
|
|
2910d5 |
|