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

Fixed vinvalbuf() to work like NFS wants it to. The previous code wouldn't

Browse Source 
flush pages in the vm object if V_SAVE was true.
This commit is contained in:
David Greenman 1995-03-21 01:13:16 +00:00
parent 7c1f6cedec
commit b946193056
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/vfs_export.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94
* $Id: vfs_subr.c,v 1.24 1995/03/20 02:08:24 davidg Exp $
* $Id: vfs_subr.c,v 1.25 1995/03/20 10:19:09 davidg Exp $
*/
/*
@ -495,12 +495,11 @@ vinvalbuf(vp, flags, cred, p, slpflag, slptimeo)
(void) VOP_BWRITE(bp);
break;
}
bp->b_flags |= B_INVAL;
bp->b_flags |= (B_INVAL|B_NOCACHE);
brelse(bp);
}
}
s = splbio();
while (vp->v_numoutput > 0) {
vp->v_flag |= VBWAIT;
@ -511,13 +510,12 @@ vinvalbuf(vp, flags, cred, p, slpflag, slptimeo)
/*
* Destroy the copy in the VM cache, too.
*/
if ((flags & V_SAVE) == 0) {
object = (vm_object_t) vp->v_vmdata;
if (object != NULL) {
vm_object_lock(object);
vm_object_page_remove(object, 0, object->size);
vm_object_unlock(object);
}
object = (vm_object_t) vp->v_vmdata;
if (object != NULL) {
vm_object_lock(object);
vm_object_page_remove(object, 0, object->size,
(flags & V_SAVE) ? TRUE : FALSE);
vm_object_unlock(object);
}
if (!(flags & V_SAVEMETA) &&
(vp->v_dirtyblkhd.lh_first || vp->v_cleanblkhd.lh_first))

18
sys/kern/vfs_subr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.13 (Berkeley) 4/18/94
* $Id: vfs_subr.c,v 1.24 1995/03/20 02:08:24 davidg Exp $
* $Id: vfs_subr.c,v 1.25 1995/03/20 10:19:09 davidg Exp $
*/
/*
@ -495,12 +495,11 @@ vinvalbuf(vp, flags, cred, p, slpflag, slptimeo)
(void) VOP_BWRITE(bp);
break;
}
bp->b_flags |= B_INVAL;
bp->b_flags |= (B_INVAL|B_NOCACHE);
brelse(bp);
}
}
s = splbio();
while (vp->v_numoutput > 0) {
vp->v_flag |= VBWAIT;
@ -511,13 +510,12 @@ vinvalbuf(vp, flags, cred, p, slpflag, slptimeo)
/*
* Destroy the copy in the VM cache, too.
*/
if ((flags & V_SAVE) == 0) {
object = (vm_object_t) vp->v_vmdata;
if (object != NULL) {
vm_object_lock(object);
vm_object_page_remove(object, 0, object->size);
vm_object_unlock(object);
}
object = (vm_object_t) vp->v_vmdata;
if (object != NULL) {
vm_object_lock(object);
vm_object_page_remove(object, 0, object->size,
(flags & V_SAVE) ? TRUE : FALSE);
vm_object_unlock(object);
}
if (!(flags & V_SAVEMETA) &&
(vp->v_dirtyblkhd.lh_first || vp->v_cleanblkhd.lh_first))