File 0169-util-Code-is-80-characters-wide.patch of Package mdadm

Overview Repositories Revisions Requests Users Attributes Meta

File 0169-util-Code-is-80-characters-wide.patch of Package mdadm (Revision d51bad1ea2340f62214782baf29c3d81)

Currently displaying revision d51bad1ea2340f62214782baf29c3d81 , Show latest

From b7a462e56135e38dfd9e53aeed6f425c28b1bbc7 Mon Sep 17 00:00:00 2001
From: Jes Sorensen <jsorensen@fb.com>
Date: Fri, 29 Sep 2017 18:15:23 -0400
Subject: [PATCH] util: Code is 80 characters wide
Git-commit: b7a462e56135e38dfd9e53aeed6f425c28b1bbc7
Patch-mainline: mdadm-4.0+
References: bsc#1069165, bsc#1069167, bsc#1068030

Lets not make things uglier than they need to be.

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Signed-off-by: Coly Li <colyli@suse.de>

---
 util.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/util.c b/util.c
index c1c8509..68af381 100644
--- a/util.c
+++ b/util.c
@@ -147,9 +147,9 @@ int cluster_get_dlmlock(int *lockid)
 	}
 
 	snprintf(str, 64, "bitmap%s", cluster_name);
-	ret = dlm_hooks->ls_lock(dlm_lock_res->ls, LKM_PWMODE, &dlm_lock_res->lksb,
-			  flags, str, strlen(str), 0, dlm_ast,
-			  dlm_lock_res, NULL, NULL);
+	ret = dlm_hooks->ls_lock(dlm_lock_res->ls, LKM_PWMODE,
+				 &dlm_lock_res->lksb, flags, str, strlen(str),
+				 0, dlm_ast, dlm_lock_res, NULL, NULL);
 	if (ret) {
 		pr_err("error %d when get PW mode on lock %s\n", errno, str);
 		dlm_hooks->release_lockspace(cluster_name, dlm_lock_res->ls, 1);
@@ -183,7 +183,8 @@ int cluster_release_dlmlock(int lockid)
 
 	errno =	dlm_lock_res->lksb.sb_status;
 	if (errno != EUNLOCK) {
-		pr_err("error %d happened in ast when unlock lockspace\n", errno);
+		pr_err("error %d happened in ast when unlock lockspace\n",
+		       errno);
 		/* XXX make sure the lockspace is unlocked eventually */
                 goto out;
 	}
@@ -639,14 +640,16 @@ char *__fname_from_uuid(int id[4], int swap, char *buf, char sep)
 
 }
 
-char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep)
+char *fname_from_uuid(struct supertype *st, struct mdinfo *info,
+		      char *buf, char sep)
 {
 	// dirty hack to work around an issue with super1 superblocks...
 	// super1 superblocks need swapuuid set in order for assembly to
 	// work, but can't have it set if we want this printout to match
 	// all the other uuid printouts in super1.c, so we force swapuuid
 	// to 1 to make our printout match the rest of super1
-	return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 : st->ss->swapuuid, buf, sep);
+	return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 :
+				 st->ss->swapuuid, buf, sep);
 }
 
 int check_ext2(int fd, char *name)
@@ -1084,9 +1087,11 @@ int dev_open(char *dev, int flags)
 		}
 		if (fd < 0) {
 			/* Try /tmp as /dev appear to be read-only */
-			snprintf(devname, sizeof(devname), "/tmp/.tmp.md.%d:%d:%d",
+			snprintf(devname, sizeof(devname),
+				 "/tmp/.tmp.md.%d:%d:%d",
 				 (int)getpid(), major, minor);
-			if (mknod(devname, S_IFBLK|0600, makedev(major, minor)) == 0) {
+			if (mknod(devname, S_IFBLK|0600,
+				  makedev(major, minor)) == 0) {
 				fd = open(devname, flags);
 				unlink(devname);
 			}
@@ -2261,8 +2266,10 @@ void set_cmap_hooks(void)
 	if (!cmap_hooks->cmap_handle)
 		return;
 
-	cmap_hooks->initialize = dlsym(cmap_hooks->cmap_handle, "cmap_initialize");
-	cmap_hooks->get_string = dlsym(cmap_hooks->cmap_handle, "cmap_get_string");
+	cmap_hooks->initialize =
+		dlsym(cmap_hooks->cmap_handle, "cmap_initialize");
+	cmap_hooks->get_string =
+		dlsym(cmap_hooks->cmap_handle, "cmap_get_string");
 	cmap_hooks->finalize = dlsym(cmap_hooks->cmap_handle, "cmap_finalize");
 
 	if (!cmap_hooks->initialize || !cmap_hooks->get_string ||
@@ -2305,8 +2312,10 @@ void set_dlm_hooks(void)
 	if (!dlm_hooks->dlm_handle)
 		return;
 
-	dlm_hooks->create_lockspace = dlsym(dlm_hooks->dlm_handle, "dlm_create_lockspace");
-	dlm_hooks->release_lockspace = dlsym(dlm_hooks->dlm_handle, "dlm_release_lockspace");
+	dlm_hooks->create_lockspace =
+		dlsym(dlm_hooks->dlm_handle, "dlm_create_lockspace");
+	dlm_hooks->release_lockspace =
+		dlsym(dlm_hooks->dlm_handle, "dlm_release_lockspace");
 	dlm_hooks->ls_lock = dlsym(dlm_hooks->dlm_handle, "dlm_ls_lock");
 	dlm_hooks->ls_unlock = dlsym(dlm_hooks->dlm_handle, "dlm_ls_unlock");
 	dlm_hooks->ls_get_fd = dlsym(dlm_hooks->dlm_handle, "dlm_ls_get_fd");
-- 
2.13.6

Places

File 0169-util-Code-is-80-characters-wide.patch of Package mdadm (Revision d51bad1ea2340f62214782baf29c3d81)

Places