---

yaml --- r: 18963 b: refs/heads/master c: 34081ef h: refs/heads/master i: 18961: 4ed3d32 18959: 4cb5575 v: v3
git-mirror · Jan 19, 2006 · 52c4830 · 52c4830
1 parent aaf9fd1
commit 52c4830
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;