diff options
| author | jmallett <jmallett@FreeBSD.org> | 2002-09-30 20:48:29 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2002-09-30 20:48:29 +0000 |
| commit | 7bf6052470a623708421c0b48efabd8eae1e91dc (patch) | |
| tree | dadbb945e63f0871379e6b36c6050e25f154942e /sys/nfsclient | |
| parent | 0f28e71fa52e856f676e2e19d41468c1aa6230b3 (diff) | |
| download | FreeBSD-src-7bf6052470a623708421c0b48efabd8eae1e91dc.zip FreeBSD-src-7bf6052470a623708421c0b48efabd8eae1e91dc.tar.gz | |
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.
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 15cf946..192e251 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/syslog.h> #include <sys/vnode.h> +#include <sys/ksiginfo.h> #include <netinet/in.h> #include <netinet/tcp.h> @@ -1239,10 +1240,10 @@ nfs_sigintr(struct nfsmount *nmp, struct nfsreq *rep, struct thread *td) return (0); p = td->td_proc; - 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) && NFSINT_SIGMASK(tmpset)) + if (signal_queued(p, 0) && NFSINT_SIGMASK(tmpset)) return (EINTR); return (0); |
