From 2b7dc9ed5fea8e782131c7efed90fa9e28008f5f Mon Sep 17 00:00:00 2001
From: Claudio Jeker <claudio@cvs.openbsd.org>
Date: Tue, 5 Oct 2021 08:38:20 +0000
Subject: For now the signal returned in cursig() is only set in p_siglist.
 Simplify the code and remove the now unused CLRSIG() macro. OK mpi@

---
 sys/sys/signalvar.h      | 11 +----------
 sys/ufs/mfs/mfs_vfsops.c |  5 +++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index fb97fb252a7..6fb4c8f9e6c 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signalvar.h,v 1.48 2021/05/10 18:01:24 mpi Exp $	*/
+/*	$OpenBSD: signalvar.h,v 1.49 2021/10/05 08:38:19 claudio Exp $	*/
 /*	$NetBSD: signalvar.h,v 1.17 1996/04/22 01:23:31 christos Exp $	*/
 
 /*
@@ -71,15 +71,6 @@ struct	sigacts {
 #define SIGPENDING(p)							\
 	(((p)->p_siglist | (p)->p_p->ps_siglist) & ~(p)->p_sigmask)
 
-/*
- * Clear a pending signal from a process.
- */
-#define CLRSIG(p, sig)	do {						\
-	int __mask = sigmask(sig);					\
-	atomic_clearbits_int(&(p)->p_siglist, __mask);			\
-	atomic_clearbits_int(&(p)->p_p->ps_siglist, __mask);		\
-} while (0)
-
 /*
  * Signal properties and actions.
  * The array below categorizes the signals and their default actions
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index dca5fe39285..5d1bd458565 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mfs_vfsops.c,v 1.60 2021/03/04 09:02:38 mpi Exp $	*/
+/*	$OpenBSD: mfs_vfsops.c,v 1.61 2021/10/05 08:38:19 claudio Exp $	*/
 /*	$NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $	*/
 
 /*
@@ -191,7 +191,8 @@ mfs_start(struct mount *mp, int flags, struct proc *p)
 			sig = cursig(p);
 			if (vfs_busy(mp, VB_WRITE|VB_NOWAIT) ||
 			    dounmount(mp, (sig == SIGKILL) ? MNT_FORCE : 0, p))
-				CLRSIG(p, sig);
+				atomic_clearbits_int(&p->p_siglist,
+				    sigmask(sig));
 			sleepreturn = 0;
 			continue;
 		}
-- 
cgit v1.2.3