Merge branch 'bugfixes' into nfs-for-2.6.38

Conflicts:
	fs/nfs/nfs2xdr.c
	fs/nfs/nfs3xdr.c
	fs/nfs/nfs4xdr.c

1 files changed, 0 insertions, 5 deletions

diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index 51f1cfa04d27..792cb13a4304 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -943,11 +943,6 @@ int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
 
         entry->d_type = DT_UNKNOWN;
 
-        /* Peek at the next entry to see if we're at EOD */
-        p = xdr_inline_peek(xdr, 4 + 4);
-        entry->eof = 0;
-        if (p != NULL)
-                entry->eof = (p[0] == xdr_zero) && (p[1] != xdr_zero);
         return 0;
 
 out_overflow: