summaryrefslogtreecommitdiff
path: root/sys/nfsclient/nfs_socket.c
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>1999-09-29 20:12:39 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>1999-09-29 20:12:39 +0000
commit16df98ecc6734950474fa5627cfa53b07a095214 (patch)
tree7ad0778a70cca2da65f619956b5260681605207b /sys/nfsclient/nfs_socket.c
parent535b6920913746869d006e8c2a2dee07d9e87935 (diff)
Notes
Diffstat (limited to 'sys/nfsclient/nfs_socket.c')
-rw-r--r--sys/nfsclient/nfs_socket.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 9434fb97f878..f7204b5fca71 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -1504,15 +1504,19 @@ nfs_sigintr(nmp, rep, p)
{
sigset_t tmpset;
- tmpset = p->p_siglist;
- SIGSETNAND(tmpset, p->p_sigmask);
- SIGSETNAND(tmpset, p->p_sigignore);
if (rep && (rep->r_flags & R_SOFTTERM))
return (EINTR);
if (!(nmp->nm_flag & NFSMNT_INT))
return (0);
- if (p && SIGNOTEMPTY(p->p_siglist) && NFSINT_SIGMASK(tmpset))
+ if (p == NULL)
+ return (0);
+
+ tmpset = p->p_siglist;
+ SIGSETNAND(tmpset, p->p_sigmask);
+ SIGSETNAND(tmpset, p->p_sigignore);
+ if (SIGNOTEMPTY(p->p_siglist) && NFSINT_SIGMASK(tmpset))
return (EINTR);
+
return (0);
}