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

Fix locking disorder in ntfs_vgetex(), which resulted in deadlock 

under heavy vnode usage - vget() must be called with unlocked ntnode!
Actually check the vget() return value and DTRT if it fails (i.e. when
the vnode has been recycled for other use).
This commit is contained in:
jdolecek 2001-06-19 22:14:14 +00:00
parent ec6b53c217
commit a0e44b481b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/ntfs/ntfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vfsops.c,v 1.35 2001/05/15 22:38:40 jdolecek Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.36 2001/06/19 22:14:14 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@ -954,11 +954,21 @@ ntfs_vgetex(
fp->f_flag |= FN_VALID;
}
/*
* We may be calling vget() now. To avoid potential deadlock, we need
* to release ntnode lock, since due to locking order vnode
* lock has to be acquired first.
* ntfs_fget() bumped ntnode usecount, so ntnode won't be recycled
* prematurely.
*/
ntfs_ntput(ip);
if (FTOV(fp)) {
VGET(FTOV(fp), lkflags, p);
*vpp = FTOV(fp);
ntfs_ntput(ip);
return (0);
/* vget() returns error if the vnode has been recycled */
if (VGET(FTOV(fp), lkflags, p) == 0) {
*vpp = FTOV(fp);
return (0);
}
}
error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, ntfs_vnodeop_p, &vp);
@ -979,8 +989,6 @@ ntfs_vgetex(
if (ino == NTFS_ROOTINO)
vp->v_flag |= VROOT;
ntfs_ntput(ip);
if (lkflags & LK_TYPE_MASK) {
error = VN_LOCK(vp, lkflags, p);
if (error) {