diff options
| -rw-r--r-- | sys/fs/nwfs/nwfs_io.c | 4 | ||||
| -rw-r--r-- | sys/fs/smbfs/smbfs_io.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_bio.c | 11 |
4 files changed, 20 insertions, 1 deletions
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index 8fdd18a13d5e..84ae3cd6b34a 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/sys/fs/nwfs/nwfs_io.c @@ -611,6 +611,10 @@ nwfs_vinvalbuf(vp, td) return EINTR; } np->n_flag |= NFLUSHINPROG; + + if (vp->v_bufobj.bo_object != NULL) + vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC); + error = vinvalbuf(vp, V_SAVE, td, PCATCH, 0); while (error) { if (error == ERESTART || error == EINTR) { diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 478ed5535bb3..7e76a876cf20 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -683,6 +683,10 @@ smbfs_vinvalbuf(struct vnode *vp, struct thread *td) return EINTR; } np->n_flag |= NFLUSHINPROG; + + if (vp->v_bufobj.bo_object != NULL) + vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC); + error = vinvalbuf(vp, V_SAVE, td, PCATCH, 0); while (error) { if (error == ERESTART || error == EINTR) { diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 50f889f601b7..da6a61b84bd7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1134,7 +1134,7 @@ flushbuflist( struct bufv *bufv, int flags, struct bufobj *bo, int slpflag, return (EAGAIN); /* XXX: why not loop ? */ } bremfree(bp); - bp->b_flags |= (B_INVAL | B_NOCACHE | B_RELBUF); + bp->b_flags |= (B_INVAL | B_RELBUF); bp->b_flags &= ~B_ASYNC; brelse(bp); BO_LOCK(bo); diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 19228ac500e6..cac21759aa7e 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -1312,6 +1312,17 @@ nfs_vinvalbuf(struct vnode *vp, int flags, struct thread *td, int intrflg) /* * Now, flush as required. */ + if ((flags & V_SAVE) && (vp->v_bufobj.bo_object != NULL)) { + vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC); + /* + * If the page clean was interrupted, fail the invalidation. + * Not doing so, we run the risk of losing dirty pages in the + * vinvalbuf() call below. + */ + if (intrflg && (error = nfs_sigintr(nmp, NULL, td))) + goto out; + } + error = vinvalbuf(vp, flags, td, slpflag, 0); while (error) { if (intrflg && (error = nfs_sigintr(nmp, NULL, td))) |