diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 16:43:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 16:43:19 -0500 |
| commit | e6236f781cc7777a2e74d256c478bb07496f35ec (patch) | |
| tree | 559a5816b803ec3f86dae82bdb9e5d3f9c20deee /fs | |
| parent | 308efab5e231d1510cd35931d87629bf5171caae (diff) | |
| parent | 1e360a60b24ad8f8685af66fa6de10ce46693a4b (diff) | |
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:
SUNRPC: Address buffer overrun in rpc_uaddr2sockaddr()
NFSv4: Fix a cache validation bug which causes getcwd() to return ENOENT
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ff37454fa783..741a562177fc 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -2767,7 +2767,7 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, | |||
| 2767 | .pages = &page, | 2767 | .pages = &page, |
| 2768 | .pgbase = 0, | 2768 | .pgbase = 0, |
| 2769 | .count = count, | 2769 | .count = count, |
| 2770 | .bitmask = NFS_SERVER(dentry->d_inode)->cache_consistency_bitmask, | 2770 | .bitmask = NFS_SERVER(dentry->d_inode)->attr_bitmask, |
| 2771 | }; | 2771 | }; |
| 2772 | struct nfs4_readdir_res res; | 2772 | struct nfs4_readdir_res res; |
| 2773 | struct rpc_message msg = { | 2773 | struct rpc_message msg = { |