[patch] Use sigprocmask for xfsprogs-4.3.0

xfsprogs-4.3.0-use-sigprocmask.patch (text/plain), 1.04 KB, created by Joshua Kinard on 2016-01-01 21:20:18 UTC

diff -Naurp xfsprogs-4.3.0.orig/copy/xfs_copy.c xfsprogs-4.3.0/copy/xfs_copy.c
--- xfsprogs-4.3.0.orig/copy/xfs_copy.c	2015-10-15 21:31:26.000000000 +0000
+++ xfsprogs-4.3.0/copy/xfs_copy.c	2016-01-01 10:53:04.722229000 +0000
@@ -75,6 +75,16 @@ static int	format_logs(struct xfs_mount
 #define LAST	0x10		/* final message we print */
 
 void
+signal_maskfunc(int addset, int newset)
+{
+	sigset_t set;
+
+	sigemptyset(&set);
+	sigaddset(&set, addset);
+	sigprocmask(newset, &set, NULL);
+}
+
+void
 do_message(int flags, int code, const char *fmt, ...)
 {
 	va_list	ap;
@@ -477,9 +487,9 @@ write_wbuf(void)
 		if (target[i].state != INACTIVE)
 			pthread_mutex_unlock(&targ[i].wait);	/* wake up */
 
-	sigrelse(SIGCHLD);
+	signal_maskfunc(SIGCHLD, SIG_UNBLOCK);
 	pthread_mutex_lock(&mainwait);
-	sighold(SIGCHLD);
+	signal_maskfunc(SIGCHLD, SIG_BLOCK);
 }
 
 void
@@ -893,7 +903,7 @@ main(int argc, char **argv)
 	/* set up sigchild signal handler */
 
 	signal(SIGCHLD, handler);
-	sighold(SIGCHLD);
+	signal_maskfunc(SIGCHLD, SIG_BLOCK);
 
 	/* make children */