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

MFC: Return error if vnode was reclaimed while it was temporarily unlocked.

Browse Source 
Add missing calls to vn_finished_write() in error handling.
This commit is contained in:
tegge 2006-05-14 00:49:35 +00:00
parent d09d10cb05
commit cba13d563e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/ufs/ffs/ffs_rawread.c
View File

@ -129,8 +129,16 @@ ffs_rawread_sync(struct vnode *vp, struct thread *td)
upgraded = 0;
/* Attempt to msync mmap() regions to clean dirty mmap */
VI_LOCK(vp);
/* Check if vnode was reclaimed while unlocked. */
if ((vp->v_iflag & VI_DOOMED) != 0) {
VI_UNLOCK(vp);
if (upgraded != 0)
VOP_LOCK(vp, LK_DOWNGRADE, td);
vn_finished_write(mp);
return (EIO);
}
/* Attempt to msync mmap() regions to clean dirty mmap */
if ((vp->v_iflag & VI_OBJDIRTY) != 0) {
VI_UNLOCK(vp);
if (vp->v_object != NULL) {
@ -150,6 +158,7 @@ ffs_rawread_sync(struct vnode *vp, struct thread *td)
VI_UNLOCK(vp);
if (upgraded != 0)
VOP_LOCK(vp, LK_DOWNGRADE, td);
vn_finished_write(mp);
return (error);
}
/* Flush dirty buffers */
@ -159,6 +168,7 @@ ffs_rawread_sync(struct vnode *vp, struct thread *td)
if ((error = ffs_syncvnode(vp, MNT_WAIT)) != 0) {
if (upgraded != 0)
VOP_LOCK(vp, LK_DOWNGRADE, td);
vn_finished_write(mp);
return (error);
}
VI_LOCK(vp);