forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bugfixes' into nfs-for-2.6.38

Browse source 
Conflicts:
	fs/nfs/nfs2xdr.c
	fs/nfs/nfs3xdr.c
	fs/nfs/nfs4xdr.c
This commit is contained in:
Trond Myklebust 2011-01-10 14:48:02 -05:00
commit 68c404b18f
423 changed files with 4286 additions and 3087 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fs/nfs/nfs4xdr.c
View file

@ -6135,12 +6135,6 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry,
if (verify_attr_len(xdr, p, len) < 0)
goto out_overflow;
p = xdr_inline_peek(xdr, 8);
if (p != NULL)
entry->eof = !p[0] && p[1];
else
entry->eof = 0;
return 0;
out_overflow: