upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove yet another deadlock case.

Browse source
This commit is contained in:
Kirk McKusick 2001-05-11 07:12:03 +00:00
parent e6d1172096
commit 9b35c30cf7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/ufs/ffs/ffs_snapshot.c
View file

@ -971,6 +971,7 @@ ffs_snapblkfree(freeip, bno, size)
VOP_UNLOCK(vp, 0, p);
break;
}
VOP_UNLOCK(vp, 0, p);
savedcbp = cbp;
}
/*
@ -981,9 +982,11 @@ ffs_snapblkfree(freeip, bno, size)
if (savedcbp) {
vp = savedcbp->b_vp;
bawrite(savedcbp);
if (VTOI(vp)->i_effnlink > 0)
if (VTOI(vp)->i_effnlink > 0) {
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
(void) VOP_FSYNC(vp, KERNCRED, MNT_WAIT, p);
VOP_UNLOCK(vp, 0, p);
VOP_UNLOCK(vp, 0, p);
}
}
/*
* If we have been unable to allocate a block in which to do
@ -1104,7 +1107,7 @@ ffs_copyonwrite(devvp, bp)
* sleep briefly, and try again.
*/
retry:
vn_lock(vp, LK_SHARED | LK_RETRY, p);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
if (lbn < NDADDR) {
blkno = ip->i_db[lbn];
} else {