Author: dfr
Date: Sat Oct 25 14:01:29 2008
New Revision: 184262
URL: http://svn.freebsd.org/changeset/base/184262
Log:
MFC: r184227 - don't use *statep without holding the vnode interlock
This change is being merged earlier than originally planned at the request
of the release engineers.
Approved by: re (kib)
Modified:
releng/6.4/sys/ (props changed)
releng/6.4/sys/kern/kern_lockf.c
Modified: releng/6.4/sys/kern/kern_lockf.c
==============================================================================
--- releng/6.4/sys/kern/kern_lockf.c Sat Oct 25 14:01:08 2008
(r184261)
+++ releng/6.4/sys/kern/kern_lockf.c Sat Oct 25 14:01:29 2008
(r184262)
@@ -467,12 +467,15 @@ lf_advlockasync(struct vop_advlockasync_
/*
* Avoid the common case of unlocking when inode has no locks.
*/
- if ((*statep) == NULL || LIST_EMPTY(&(*statep)->ls_active)) {
+ VI_LOCK(vp);
+ if ((*statep) == NULL) {
if (ap->a_op != F_SETLK) {
fl->l_type = F_UNLCK;
+ VI_UNLOCK(vp);
return (0);
}
}
+ VI_UNLOCK(vp);
/*
* Map our arguments to an existing lock owner or create one
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
