aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfs/dir.c8
-rw-r--r--include/linux/nfs_fs.h1
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 9ccb15e86967..dffa21abd3ea 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -165,12 +165,10 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
165 NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME; 165 NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
166 /* Ensure consistent page alignment of the data. 166 /* Ensure consistent page alignment of the data.
167 * Note: assumes we have exclusive access to this mapping either 167 * Note: assumes we have exclusive access to this mapping either
168 * throught inode->i_sem or some other mechanism. 168 * through inode->i_sem or some other mechanism.
169 */ 169 */
170 if (page->index == 0) { 170 if (page->index == 0)
171 invalidate_inode_pages(inode->i_mapping); 171 invalidate_inode_pages2_range(inode->i_mapping, PAGE_CACHE_SIZE, -1);
172 NFS_I(inode)->readdir_timestamp = timestamp;
173 }
174 unlock_page(page); 172 unlock_page(page);
175 return 0; 173 return 0;
176 error: 174 error:
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index fb33e7655cfa..68d5aae89972 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -128,7 +128,6 @@ struct nfs_inode {
128 * 128 *
129 * mtime != read_cache_mtime 129 * mtime != read_cache_mtime
130 */ 130 */
131 unsigned long readdir_timestamp;
132 unsigned long read_cache_jiffies; 131 unsigned long read_cache_jiffies;
133 unsigned long attrtimeo; 132 unsigned long attrtimeo;
134 unsigned long attrtimeo_timestamp; 133 unsigned long attrtimeo_timestamp;