summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds2008-07-08 21:40:57 +0200
committerLinus Torvalds2008-07-08 21:40:57 +0200
commitf57e91682d141ea50d8c6d42cdc251b6256a3755 (patch)
treea9c94baebf4b33454673c600fe586b6c65600446 /fs
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentSUNRPC: Fix an rpcbind breakage for the case of IPv6 lookups (diff)
downloadkernel-qcow2-linux-f57e91682d141ea50d8c6d42cdc251b6256a3755.tar.gz
kernel-qcow2-linux-f57e91682d141ea50d8c6d42cdc251b6256a3755.tar.xz
kernel-qcow2-linux-f57e91682d141ea50d8c6d42cdc251b6256a3755.zip
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: SUNRPC: Fix an rpcbind breakage for the case of IPv6 lookups SUNRPC: Fix a double-free in rpcbind NFS: Fix readdir cache invalidation
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 58d43daec084..982a2064fe4c 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -204,7 +204,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
* Note: assumes we have exclusive access to this mapping either
* through inode->i_mutex or some other mechanism.
*/
- if (page->index == 0 && invalidate_inode_pages2_range(inode->i_mapping, PAGE_CACHE_SIZE, -1) < 0) {
+ if (invalidate_inode_pages2_range(inode->i_mapping, page->index + 1, -1) < 0) {
/* Should never happen */
nfs_zap_mapping(inode, inode->i_mapping);
}