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

Correct a significant problem with the softupdates port. Allow fsync

Browse Source 
to work properly within the softupdates framework, and thereby eliminate
some unfortunate panics.
This commit is contained in:
John Dyson 1998-03-29 18:23:44 +00:00
parent 7f3e28046d
commit 006b9b7df9
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/vfs_extattr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.94 1998/03/07 21:35:39 dyson Exp $
* $Id: vfs_syscalls.c,v 1.95 1998/03/08 09:57:21 julian Exp $
*/
/* For 4.3 integer FS ID compatibility */
@ -2177,10 +2177,17 @@ fsync(p, uap)
if (vp->v_object) {
vm_object_page_clean(vp->v_object, 0, 0, FALSE);
}
error = VOP_FSYNC(vp, fp->f_cred,
(vp->v_mount && (vp->v_mount->mnt_flag & MNT_ASYNC)) ?
MNT_NOWAIT : MNT_WAIT, p);
if (vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP)) {
error = VOP_FSYNC(vp, fp->f_cred, MNT_LAZY, p);
} else {
error = VOP_FSYNC(vp, fp->f_cred,
(vp->v_mount && (vp->v_mount->mnt_flag & MNT_ASYNC)) ?
MNT_NOWAIT : MNT_WAIT, p);
}
VOP_UNLOCK(vp, 0, p);
if ((vp->v_mount->mnt_flag & MNT_SOFTDEP) && bioops.io_sync)
(*bioops.io_sync)(NULL);
}
return (error);
}

15
sys/kern/vfs_syscalls.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.94 1998/03/07 21:35:39 dyson Exp $
* $Id: vfs_syscalls.c,v 1.95 1998/03/08 09:57:21 julian Exp $
*/
/* For 4.3 integer FS ID compatibility */
@ -2177,10 +2177,17 @@ fsync(p, uap)
if (vp->v_object) {
vm_object_page_clean(vp->v_object, 0, 0, FALSE);
}
error = VOP_FSYNC(vp, fp->f_cred,
(vp->v_mount && (vp->v_mount->mnt_flag & MNT_ASYNC)) ?
MNT_NOWAIT : MNT_WAIT, p);
if (vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP)) {
error = VOP_FSYNC(vp, fp->f_cred, MNT_LAZY, p);
} else {
error = VOP_FSYNC(vp, fp->f_cred,
(vp->v_mount && (vp->v_mount->mnt_flag & MNT_ASYNC)) ?
MNT_NOWAIT : MNT_WAIT, p);
}
VOP_UNLOCK(vp, 0, p);
if ((vp->v_mount->mnt_flag & MNT_SOFTDEP) && bioops.io_sync)
(*bioops.io_sync)(NULL);
}
return (error);
}