Date: Sat, 25 Oct 2008 14:00:38 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r184260 - in stable/7/sys: . kern Message-ID: <200810251400.m9PE0c3B033955@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dfr Date: Sat Oct 25 14:00:37 2008 New Revision: 184260 URL: http://svn.freebsd.org/changeset/base/184260 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: stable/7/sys/ (props changed) stable/7/sys/kern/kern_lockf.c Modified: stable/7/sys/kern/kern_lockf.c ============================================================================== --- stable/7/sys/kern/kern_lockf.c Sat Oct 25 11:37:42 2008 (r184259) +++ stable/7/sys/kern/kern_lockf.c Sat Oct 25 14:00:37 2008 (r184260) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810251400.m9PE0c3B033955>