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

Add kludge to avoid deadlock when unlinking snapshot.

Browse Source
This commit is contained in:
Tor Egge 2006-03-19 21:29:20 +00:00
parent 95e7a3c3ac
commit 30b3a49fab
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/ufs/ufs/ufs_vnops.c
View File

@ -756,7 +756,9 @@ ufs_remove(ap)
struct vnode *vp = ap->a_vp;
struct vnode *dvp = ap->a_dvp;
int error;
struct thread *td;
td = curthread;
ip = VTOI(vp);
if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) ||
(VTOI(dvp)->i_flags & APPEND)) {
@ -766,6 +768,20 @@ ufs_remove(ap)
error = ufs_dirremove(dvp, ip, ap->a_cnp->cn_flags, 0);
if (ip->i_nlink <= 0)
vp->v_vflag |= VV_NOSYNC;
if ((ip->i_flags & SF_SNAPSHOT) != 0) {
/*
* Avoid deadlock where another thread is trying to
* update the inodeblock for dvp and is waiting on
* snaplk. Temporary unlock the vnode lock for the
* unlinked file and sync the directory. This should
* allow vput() of the directory to not block later on
* while holding the snapshot vnode locked, assuming
* that the directory hasn't been unlinked too.
*/
VOP_UNLOCK(vp, 0, td);
(void) VOP_FSYNC(dvp, MNT_WAIT, td);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
}
out:
return (error);
}