diff options
| author | John Dyson <dyson@FreeBSD.org> | 1998-01-25 06:14:26 +0000 |
|---|---|---|
| committer | John Dyson <dyson@FreeBSD.org> | 1998-01-25 06:14:26 +0000 |
| commit | 8447a0aed73ae21b43af90b22e2401a87a2db7d3 (patch) | |
| tree | 268122c62f01be4d0f6e36614ed96de4b0976614 | |
| parent | bed196b4e283141cdd41592573af6bacc997c9d7 (diff) | |
Notes
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 20 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 20 |
2 files changed, 26 insertions, 14 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 41b3d969a909..51cd281a138b 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.74 1997/12/29 00:23:41 dyson Exp $ + * $Id: nfs_vnops.c,v 1.75 1998/01/08 23:42:03 eivind Exp $ */ @@ -403,38 +403,44 @@ nfs_open(ap) error = nqnfs_getlease(vp, ND_READ, ap->a_cred, ap->a_p); } while (error == NQNFS_EXPIRED); - if (error) + if (error) { return (error); + } if (np->n_lrev != np->n_brev || (np->n_flag & NQNFSNONCACHE)) { if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, - ap->a_p, 1)) == EINTR) + ap->a_p, 1)) == EINTR) { return (error); + } np->n_brev = np->n_lrev; } } } else { if (np->n_flag & NMODIFIED) { if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, - ap->a_p, 1)) == EINTR) + ap->a_p, 1)) == EINTR) { return (error); + } np->n_attrstamp = 0; if (vp->v_type == VDIR) np->n_direofoffset = 0; error = VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_p); - if (error) + if (error) { return (error); + } np->n_mtime = vattr.va_mtime.tv_sec; } else { error = VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_p); - if (error) + if (error) { return (error); + } if (np->n_mtime != vattr.va_mtime.tv_sec) { if (vp->v_type == VDIR) np->n_direofoffset = 0; if ((error = nfs_vinvalbuf(vp, V_SAVE, - ap->a_cred, ap->a_p, 1)) == EINTR) + ap->a_cred, ap->a_p, 1)) == EINTR) { return (error); + } np->n_mtime = vattr.va_mtime.tv_sec; } } diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 41b3d969a909..51cd281a138b 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.74 1997/12/29 00:23:41 dyson Exp $ + * $Id: nfs_vnops.c,v 1.75 1998/01/08 23:42:03 eivind Exp $ */ @@ -403,38 +403,44 @@ nfs_open(ap) error = nqnfs_getlease(vp, ND_READ, ap->a_cred, ap->a_p); } while (error == NQNFS_EXPIRED); - if (error) + if (error) { return (error); + } if (np->n_lrev != np->n_brev || (np->n_flag & NQNFSNONCACHE)) { if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, - ap->a_p, 1)) == EINTR) + ap->a_p, 1)) == EINTR) { return (error); + } np->n_brev = np->n_lrev; } } } else { if (np->n_flag & NMODIFIED) { if ((error = nfs_vinvalbuf(vp, V_SAVE, ap->a_cred, - ap->a_p, 1)) == EINTR) + ap->a_p, 1)) == EINTR) { return (error); + } np->n_attrstamp = 0; if (vp->v_type == VDIR) np->n_direofoffset = 0; error = VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_p); - if (error) + if (error) { return (error); + } np->n_mtime = vattr.va_mtime.tv_sec; } else { error = VOP_GETATTR(vp, &vattr, ap->a_cred, ap->a_p); - if (error) + if (error) { return (error); + } if (np->n_mtime != vattr.va_mtime.tv_sec) { if (vp->v_type == VDIR) np->n_direofoffset = 0; if ((error = nfs_vinvalbuf(vp, V_SAVE, - ap->a_cred, ap->a_p, 1)) == EINTR) + ap->a_cred, ap->a_p, 1)) == EINTR) { return (error); + } np->n_mtime = vattr.va_mtime.tv_sec; } } |