From 52c483070a70756b7c14ecedeac7285047440a5d Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@citi.umich.edu>
Date: Wed, 18 Jan 2006 17:43:40 -0800
Subject: [PATCH] --- yaml --- r: 18963 b: refs/heads/master c:
 34081efc12aaaa12f20e5b59f3cb98ba6e27fb34 h: refs/heads/master i:   18961:
 4ed3d32dd680222c45eabe9d385daae8de2b81c1   18959:
 4cb55754c8d58e4d63ff6329a78b376834051268 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfs4xdr.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 501eebdeaa7d..808583b9c5c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c26d08f02f829a833d393c3f1b196538a9ec2c4
+refs/heads/master: 34081efc12aaaa12f20e5b59f3cb98ba6e27fb34
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index 6b743327686c..69d3501173a8 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/fs/nfsd/nfs4xdr.c
@@ -1764,10 +1764,11 @@ nfsd4_encode_dirent(struct readdir_cd *ccd, const char *name, int namlen,
 		 */
 		if (!(cd->rd_bmval[0] & FATTR4_WORD0_RDATTR_ERROR))
 			goto fail;
-		nfserr = nfserr_toosmall;
 		p = nfsd4_encode_rdattr_error(p, buflen, nfserr);
-		if (p == NULL)
+		if (p == NULL) {
+			nfserr = nfserr_toosmall;
 			goto fail;
+		}
 	}
 	cd->buflen -= (p - cd->buffer);
 	cd->buffer = p;