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

If a buffer flush fails when trying to reclaim a vnode, it is too

Browse Source 
late to save the vnode, so just toss any remaining unwritten buffers
rather than leaving them lying around to make trouble in the future.
This commit is contained in:
Kirk McKusick 2000-07-04 03:23:29 +00:00
parent 4572bcfe05
commit 3764219663
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/vfs_export.c
View File

@ -1660,14 +1660,20 @@ vclean(vp, flags, p)
/*
* Clean out any buffers associated with the vnode.
* If the flush fails, just toss the buffers.
*/
vinvalbuf(vp, V_SAVE, NOCRED, p, 0, 0);
if (flags & DOCLOSE) {
if (vinvalbuf(vp, V_SAVE, NOCRED, p, 0, 0) != 0)
vinvalbuf(vp, 0, NOCRED, p, 0, 0);
}
if ((obj = vp->v_object) != NULL) {
if (obj->ref_count == 0) {
/*
* vclean() may be called twice. The first time removes the
* primary reference to the object, the second time goes
* one further and is a special-case to terminate the object.
* vclean() may be called twice. The first time
* removes the primary reference to the object,
* the second time goes one further and is a
* special-case to terminate the object.
*/
vm_object_terminate(obj);
} else {

14
sys/kern/vfs_subr.c
View File

@ -1660,14 +1660,20 @@ vclean(vp, flags, p)
/*
* Clean out any buffers associated with the vnode.
* If the flush fails, just toss the buffers.
*/
vinvalbuf(vp, V_SAVE, NOCRED, p, 0, 0);
if (flags & DOCLOSE) {
if (vinvalbuf(vp, V_SAVE, NOCRED, p, 0, 0) != 0)
vinvalbuf(vp, 0, NOCRED, p, 0, 0);
}
if ((obj = vp->v_object) != NULL) {
if (obj->ref_count == 0) {
/*
* vclean() may be called twice. The first time removes the
* primary reference to the object, the second time goes
* one further and is a special-case to terminate the object.
* vclean() may be called twice. The first time
* removes the primary reference to the object,
* the second time goes one further and is a
* special-case to terminate the object.
*/
vm_object_terminate(obj);
} else {