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

Unlock the struct file lock before aquiring Giant, otherwise

Browse Source 
we can deadlock because of lock order reversals.  This was not
caught because Witness ignores pool mutexes right now.

Diagnosis and help: truckman
Noticed by: pho
This commit is contained in:
Alfred Perlstein 2003-06-19 18:13:07 +00:00
parent d6c28affbd
commit bab88630ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_descrip.c
View File

@ -2010,6 +2010,8 @@ fdrop_locked(fp, td)
FILE_UNLOCK(fp);
return (0);
}
/* We have the last ref so we can proceed without the file lock. */
FILE_UNLOCK(fp);
mtx_lock(&Giant);
if (fp->f_count < 0)
panic("fdrop: count < 0");
@ -2019,10 +2021,8 @@ fdrop_locked(fp, td)
lf.l_len = 0;
lf.l_type = F_UNLCK;
vp = fp->f_data;
FILE_UNLOCK(fp);
(void) VOP_ADVLOCK(vp, (caddr_t)fp, F_UNLCK, &lf, F_FLOCK);
} else
FILE_UNLOCK(fp);
}
if (fp->f_ops != &badfileops)
error = fo_close(fp, td);
else