File 0055-Fix-up-a-few-formatting-issues.patch of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File 0055-Fix-up-a-few-formatting-issues.patch of Package mdadm (Revision ffb1442a30c0689bd1f2ec1c0bd275b1)

Currently displaying revision ffb1442a30c0689bd1f2ec1c0bd275b1 , Show latest

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

Places

File 0055-Fix-up-a-few-formatting-issues.patch of Package mdadm (Revision ffb1442a30c0689bd1f2ec1c0bd275b1)

Places