aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:30:30 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:30:30 +0900
commit19650e8580987c0ffabc2fe2cbc16b944789df8b (patch)
treecf0cfb390a128e3b2d47daa46f59de0a62a8ff04 /include
parent1eb4c6362cb7d6a2f904c555c10dc45caeeefc31 (diff)
parent0b26a0bf6ff398185546432420bb772bcfdf8d94 (diff)
downloadmrst-s0i3-test-19650e8580987c0ffabc2fe2cbc16b944789df8b.tar.gz
mrst-s0i3-test-19650e8580987c0ffabc2fe2cbc16b944789df8b.tar.xz
mrst-s0i3-test-19650e8580987c0ffabc2fe2cbc16b944789df8b.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Ensure we return the dirent->d_type when it is known NFS: Correct the array bound calculation in nfs_readdir_add_to_array NFS: Don't ignore errors from nfs_do_filldir() NFS: Fix the error handling in "uncached_readdir()" NFS: Fix a page leak in uncached_readdir() NFS: Fix a page leak in nfs_do_filldir() NFS: Assume eof if the server returns no readdir records NFS: Buffer overflow in ->decode_dirent() should not be fatal Pure nfs client performance using odirect. SUNRPC: Fix an infinite loop in call_refresh/call_refreshresult
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_xdr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index ba6cc8f223c..80f07198a31 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -483,6 +483,7 @@ struct nfs_entry {
int eof;
struct nfs_fh * fh;
struct nfs_fattr * fattr;
+ unsigned char d_type;
};
/*