diff options
| author | Paul Saab <ps@FreeBSD.org> | 2005-11-21 19:23:46 +0000 |
|---|---|---|
| committer | Paul Saab <ps@FreeBSD.org> | 2005-11-21 19:23:46 +0000 |
| commit | 3834aac17ec71ce0bde77afe381a0f007d2d5d1d (patch) | |
| tree | 6ba2c8e7d1aaff8621b20d87076ec42196255126 /sys | |
| parent | d0a14f55c3d0b0cb7156bb5f0db1382368402d39 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/nfsclient/nfs_bio.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 3018dda5bbf75..896bb17e5311f 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -1605,7 +1605,7 @@ nfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td) * bp in this case is not an NFS cache block so we should * be safe. XXX */ - if (error == EINTR || error == EIO + if (error == EINTR || error == EIO || error == ETIMEDOUT || (!error && (bp->b_flags & B_NEEDCOMMIT))) { int s; diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 2cbf834fa95e9..6634190e013fe 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -2564,7 +2564,6 @@ nfs_strategy(struct vop_strategy_args *ap) struct buf *bp = ap->a_bp; struct ucred *cr; struct thread *td; - int error = 0; KASSERT(!(bp->b_flags & B_DONE), ("nfs_strategy: buffer %p unexpectedly marked B_DONE", bp)); KASSERT(BUF_REFCNT(bp) > 0, ("nfs_strategy: buffer %p not locked", bp)); @@ -2585,9 +2584,9 @@ nfs_strategy(struct vop_strategy_args *ap) * otherwise just do it ourselves. */ if ((bp->b_flags & B_ASYNC) == 0 || - nfs_asyncio(VFSTONFS(ap->a_vp->v_mount), bp, NOCRED, td)) - error = nfs_doio(ap->a_vp, bp, cr, td); - return (error); + nfs_asyncio(VFSTONFS(ap->a_vp->v_mount), bp, NOCRED, td)) + (void)nfs_doio(ap->a_vp, bp, cr, td); + return (0); } /* |