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

MFC: Various fixes to NFS DirectIO support.

Browse Source
This commit is contained in:
jhb 2007-05-02 15:15:51 +00:00
parent be8a714fcf
commit bb88c2f7b4
2 changed files with 13 additions and 7 deletions

16
sys/nfsclient/nfs_bio.c

@ -800,13 +800,11 @@ do_sync:
bp->b_wcred = NOCRED;
bp->b_caller1 = (void *)t_uio;
bp->b_vp = vp;
vhold(vp);
error = nfs_asyncio(nmp, bp, NOCRED, td);
if (error) {
free(t_iov->iov_base, M_NFSDIRECTIO);
free(t_iov, M_NFSDIRECTIO);
free(t_uio, M_NFSDIRECTIO);
vdrop(bp->b_vp);
bp->b_vp = NULL;
relpbuf(bp, &nfs_pbuf_freecnt);
if (error == EINTR)
@ -1472,8 +1470,10 @@ again:
BUF_KERNPROC(bp);
TAILQ_INSERT_TAIL(&nmp->nm_bufq, bp, b_freelist);
nmp->nm_bufqlen++;
if ((bp->b_flags & B_DIRECT) && bp->b_iocmd == BIO_WRITE)
if ((bp->b_flags & B_DIRECT) && bp->b_iocmd == BIO_WRITE) {
VTONFS(bp->b_vp)->n_flag |= NMODIFIED;
VTONFS(bp->b_vp)->n_directio_asyncwr++;
}
return (0);
}
@ -1504,12 +1504,14 @@ nfs_doio_directwrite(struct buf *bp)
struct nfsnode *np = VTONFS(bp->b_vp);
np->n_directio_asyncwr--;
if ((np->n_flag & NFSYNCWAIT) && np->n_directio_asyncwr == 0) {
np->n_flag &= ~NFSYNCWAIT;
wakeup((caddr_t)&np->n_directio_asyncwr);
if (np->n_directio_asyncwr == 0) {
VTONFS(bp->b_vp)->n_flag &= ~NMODIFIED;
if ((np->n_flag & NFSYNCWAIT)) {
np->n_flag &= ~NFSYNCWAIT;
wakeup((caddr_t)&np->n_directio_asyncwr);
}
}
}
vdrop(bp->b_vp);
bp->b_vp = NULL;
relpbuf(bp, &nfs_pbuf_freecnt);
}

4
sys/nfsclient/nfs_vnops.c

@ -552,6 +552,10 @@ nfs_close(struct vop_close_args *ap)
error = np->n_error;
}
}
if (nfs_directio_enable)
KASSERT((np->n_directio_asyncwr == 0),
("nfs_close: dirty unflushed (%d) directio buffers\n",
np->n_directio_asyncwr));
if (nfs_directio_enable && (fmode & O_DIRECT) && (vp->v_type == VREG)) {
KASSERT((np->n_directio_opens > 0),
("nfs_close: unexpectedly value (0) of n_directio_opens\n"));