From b61b207769f7855fc97d3b68d97572c476de3330 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 22 Jun 2005 17:16:21 +0000
Subject: [PATCH] --- yaml --- r: 2761 b: refs/heads/master c:
 a656db998785324a818005bcf71bae6dcbbb3cf5 h: refs/heads/master i:   2759:
 cb6aaae4b88ebd5438f369e69415d95e98cb7dac v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfs/dir.c           | 8 +++-----
 trunk/include/linux/nfs_fs.h | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 782848672694..b1c052534793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce79717ce32a9f88c1ddce4b9658556cb59d37a
+refs/heads/master: a656db998785324a818005bcf71bae6dcbbb3cf5
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 9ccb15e86967..dffa21abd3ea 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -165,12 +165,10 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
 	NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
 	/* Ensure consistent page alignment of the data.
 	 * Note: assumes we have exclusive access to this mapping either
-	 *	 throught inode->i_sem or some other mechanism.
+	 *	 through inode->i_sem or some other mechanism.
 	 */
-	if (page->index == 0) {
-		invalidate_inode_pages(inode->i_mapping);
-		NFS_I(inode)->readdir_timestamp = timestamp;
-	}
+	if (page->index == 0)
+		invalidate_inode_pages2_range(inode->i_mapping, PAGE_CACHE_SIZE, -1);
 	unlock_page(page);
 	return 0;
  error:
diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h
index fb33e7655cfa..68d5aae89972 100644
--- a/trunk/include/linux/nfs_fs.h
+++ b/trunk/include/linux/nfs_fs.h
@@ -128,7 +128,6 @@ struct nfs_inode {
 	 *
 	 *	mtime != read_cache_mtime
 	 */
-	unsigned long		readdir_timestamp;
 	unsigned long		read_cache_jiffies;
 	unsigned long		attrtimeo;
 	unsigned long		attrtimeo_timestamp;