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

This corrects the first of two known deadlock conditions that

Browse Source 
come from the presence of a snapshot file.
This commit is contained in:
Kirk McKusick 2002-03-14 01:21:13 +00:00
parent b81b083819
commit 9721068f95
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/ufs/ffs/ffs_vnops.c
View File

@ -140,14 +140,6 @@ ffs_fsync(ap)
int s, error, wait, passes, skipmeta;
daddr_t lbn;
/*
* Snapshots have to be unlocked so they do not deadlock
* checking whether they need to copy their written buffers.
* We always hold a reference, so they cannot be removed
* out from underneath us.
*/
if (ip->i_flags & SF_SNAPSHOT)
VOP_UNLOCK(vp, 0, ap->a_td);
wait = (ap->a_waitfor == MNT_WAIT);
if (vn_isdisk(vp, NULL)) {
lbn = INT_MAX;
@ -289,8 +281,5 @@ ffs_fsync(ap)
}
}
splx(s);
error = UFS_UPDATE(vp, wait);
if (ip->i_flags & SF_SNAPSHOT)
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, ap->a_td);
return (error);
return (UFS_UPDATE(vp, wait));
}