Convert use of p_siglist and old SIG*() macros to use <sys/ksiginfo.h>

prototyped functions to get a sigset_t, and further to check for any
queued signals, rather than an empty signal set, to go with the move
to signal queues rather than signal sets.

1 files changed, 3 insertions, 2 deletions

diff --git a/sys/netsmb/smb_subr.c b/sys/netsmb/smb_subr.c
index 4a37d6e..2b428a3 100644
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@@ -42,6 +42,7 @@
 #include <sys/socket.h>
 #include <sys/signalvar.h>
 #include <sys/mbuf.h>
+#include <sys/ksiginfo.h>
 
 #include <sys/iconv.h>
 
@@ -75,10 +76,10 @@ smb_proc_intr(struct proc *p)
 
 	if (p == NULL)
 		return 0;
-	tmpset = p->p_siglist;
+	ksiginfo_to_sigset_t(p, &tmpset);
 	SIGSETNAND(tmpset, p->p_sigmask);
 	SIGSETNAND(tmpset, p->p_sigignore);
-	if (SIGNOTEMPTY(p->p_siglist) && SMB_SIGMASK(tmpset))
+	if (signal_queued(p, 0) && SMB_SIGMASK(tmpset))
                 return EINTR;
 	return 0;
 }