d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unlock the process returned from pfind() if it does not return NULL.

Browse Source 
This fixes a witness lock violation for nfssvc returning with locks
held.

Submitted by:	Jean-Luc Richier <Jean-Luc.Richier@imag.fr>
PR:		kern/27776
This commit is contained in:
Jake Burkholder 2001-06-01 01:30:51 +00:00
parent 0444aaa030
commit d389ead74f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/nfs/nfs_lock.c
View File

@ -260,8 +260,10 @@ nfslockdans(p, ansp)
((ansp->la_msg_ident.msg_seq != -1) &&
(timevalcmp(&p->p_nlminfo->pid_start,
&ansp->la_msg_ident.pid_start, !=) ||
p->p_nlminfo->msg_seq != ansp->la_msg_ident.msg_seq)))
p->p_nlminfo->msg_seq != ansp->la_msg_ident.msg_seq))) {
PROC_UNLOCK(p);
return (EPIPE);
}
p->p_nlminfo->retcode = ansp->la_errno;
p->p_nlminfo->set_getlk_pid = ansp->la_set_getlk_pid;
@ -269,5 +271,6 @@ nfslockdans(p, ansp)
(void)wakeup((void *)p->p_nlminfo);
PROC_UNLOCK(p);
return (0);
}

5
sys/nfsclient/nfs_lock.c
View File

@ -260,8 +260,10 @@ nfslockdans(p, ansp)
((ansp->la_msg_ident.msg_seq != -1) &&
(timevalcmp(&p->p_nlminfo->pid_start,
&ansp->la_msg_ident.pid_start, !=) ||
p->p_nlminfo->msg_seq != ansp->la_msg_ident.msg_seq)))
p->p_nlminfo->msg_seq != ansp->la_msg_ident.msg_seq))) {
PROC_UNLOCK(p);
return (EPIPE);
}
p->p_nlminfo->retcode = ansp->la_errno;
p->p_nlminfo->set_getlk_pid = ansp->la_set_getlk_pid;
@ -269,5 +271,6 @@ nfslockdans(p, ansp)
(void)wakeup((void *)p->p_nlminfo);
PROC_UNLOCK(p);
return (0);
}