summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-19 13:43:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-19 13:43:19 -0800
commite6236f781cc7777a2e74d256c478bb07496f35ec (patch)
tree559a5816b803ec3f86dae82bdb9e5d3f9c20deee /fs
parent308efab5e231d1510cd35931d87629bf5171caae (diff)
parent1e360a60b24ad8f8685af66fa6de10ce46693a4b (diff)
downloadop-kernel-dev-e6236f781cc7777a2e74d256c478bb07496f35ec.zip
op-kernel-dev-e6236f781cc7777a2e74d256c478bb07496f35ec.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ff37454..741a562 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,
.pages = &page,
.pgbase = 0,
.count = count,
- .bitmask = NFS_SERVER(dentry->d_inode)->cache_consistency_bitmask,
+ .bitmask = NFS_SERVER(dentry->d_inode)->attr_bitmask,
};
struct nfs4_readdir_res res;
struct rpc_message msg = {
OpenPOWER on IntegriCloud