From e1b686876b873a6060855d79d1a877044d9025c9 Mon Sep 17 00:00:00 2001
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 24 Jul 1995 16:38:05 +0000
Subject: [PATCH] Slightly better fix than previous revision.

Submitted by:	Rick Macklem <rick@snowhite.cis.uoguelph.ca>
---
 sys/nfs/nfs_vnops.c       | 7 +++----
 sys/nfsclient/nfs_vnops.c | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 403bd977e678..2b66340c5cb5 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.20 1995/07/13 17:55:12 dfr Exp $
+ * $Id: nfs_vnops.c,v 1.21 1995/07/24 12:50:49 dfr Exp $
  */
 
 /*
@@ -619,9 +619,8 @@ nfs_setattr(ap)
 		 ap->a_p, 1)) == EINTR)
 		return (error);
 	error = nfs_setattrrpc(vp, vap, ap->a_cred, ap->a_p);
-	if (error) {
-		if (vap->va_size != VNOVAL)
-			np->n_size = np->n_vattr.va_size = tsize;
+	if (error && vap->va_size != VNOVAL) {
+		np->n_size = np->n_vattr.va_size = tsize;
 		vnode_pager_setsize(vp, (u_long)np->n_size);
 	}
 	return (error);
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 403bd977e678..2b66340c5cb5 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.20 1995/07/13 17:55:12 dfr Exp $
+ * $Id: nfs_vnops.c,v 1.21 1995/07/24 12:50:49 dfr Exp $
  */
 
 /*
@@ -619,9 +619,8 @@ nfs_setattr(ap)
 		 ap->a_p, 1)) == EINTR)
 		return (error);
 	error = nfs_setattrrpc(vp, vap, ap->a_cred, ap->a_p);
-	if (error) {
-		if (vap->va_size != VNOVAL)
-			np->n_size = np->n_vattr.va_size = tsize;
+	if (error && vap->va_size != VNOVAL) {
+		np->n_size = np->n_vattr.va_size = tsize;
 		vnode_pager_setsize(vp, (u_long)np->n_size);
 	}
 	return (error);