From 2455af4b10ad128e33380bc43d881a07b5b863f1 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 28 Jan 2011 12:41:05 -0500
Subject: [PATCH] --- yaml --- r: 232699 b: refs/heads/master c:
 d1205f87bbb8040c1408bbd9e0a720310b2b0b9b h: refs/heads/master i:   232697:
 39fa08284bd197adeaf978fda39db17ec90aae88   232695:
 4ead36cc8088e9ef2cef9a1fed1442cd350f2636 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfs/nfs4xdr.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1eacd24ebf00..57cfb0971a7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c08e76d0cd4beb759a73c1835d98f5fccc126ed1
+refs/heads/master: d1205f87bbb8040c1408bbd9e0a720310b2b0b9b
diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c
index 009aef9e12bc..4e2c168b6ee9 100644
--- a/trunk/fs/nfs/nfs4xdr.c
+++ b/trunk/fs/nfs/nfs4xdr.c
@@ -6132,9 +6132,6 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
 	if (entry->fattr->valid & NFS_ATTR_FATTR_TYPE)
 		entry->d_type = nfs_umode_to_dtype(entry->fattr->mode);
 
-	if (verify_attr_len(xdr, p, len) < 0)
-		goto out_overflow;
-
 	return 0;
 
 out_overflow: