Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vget: don't leak a reference if LK_NOWAIT and the vnode has VI_XLOCK set.

Browse Source
This commit is contained in:
ad 2008-01-09 21:29:38 +00:00
parent cf3691bced
commit b1a7a7cd93
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/vfs_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_subr.c,v 1.312 2008/01/09 16:15:22 ad Exp $ */ /* $NetBSD: vfs_subr.c,v 1.313 2008/01/09 21:29:38 ad Exp $ */
/*- /*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007 The NetBSD Foundation, Inc. * Copyright (c) 1997, 1998, 2004, 2005, 2007 The NetBSD Foundation, Inc.
@ -82,7 +82,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.312 2008/01/09 16:15:22 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.313 2008/01/09 21:29:38 ad Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_ddb.h" #include "opt_ddb.h"
@ -829,22 +829,24 @@ vget(vnode_t *vp, int flags)
* the VI_XLOCK or VI_FREEING flags are set. * the VI_XLOCK or VI_FREEING flags are set.
*/ */
if ((vp->v_iflag & (VI_XLOCK | VI_FREEING)) != 0) { if ((vp->v_iflag & (VI_XLOCK | VI_FREEING)) != 0) {
if (flags & LK_NOWAIT) { if ((flags & LK_NOWAIT) != 0) {
vp->v_usecount--;
mutex_exit(&vp->v_interlock); mutex_exit(&vp->v_interlock);
return EBUSY; return EBUSY;
} }
vwait(vp, VI_XLOCK | VI_FREEING); vwait(vp, VI_XLOCK | VI_FREEING);
vrelel(vp, 1, 0); vrelel(vp, 1, 0);
return (ENOENT); return ENOENT;
} }
if (flags & LK_TYPE_MASK) { if (flags & LK_TYPE_MASK) {
if ((error = vn_lock(vp, flags | LK_INTERLOCK))) { error = vn_lock(vp, flags | LK_INTERLOCK);
if (error != 0) {
vrele(vp); vrele(vp);
} }
return (error); return error;
} }
mutex_exit(&vp->v_interlock); mutex_exit(&vp->v_interlock);
return (0); return 0;
} }
/* /*