xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent d035c36c58 6650239a4b
commit 68c404b18f
423 changed files with 4286 additions and 3087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/nfs2xdr.c
View File

@@ -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: