NFS: Flesh out nfs_invalidate_page()

In the case of a call to truncate_inode_pages(), we should really try to
cancel any pending writes on the page.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 1b524b9f982a..fc48135621ed 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -61,6 +61,7 @@
 #define FLUSH_LOWPRI            8       /* low priority background flush */
 #define FLUSH_HIGHPRI           16      /* high priority memory reclaim flush */
 #define FLUSH_NOCOMMIT          32      /* Don't send the NFSv3/v4 COMMIT */
+#define FLUSH_INVALIDATE        64      /* Invalidate the page cache */
 
 #ifdef __KERNEL__
 
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 66e2ed658527..8cadb0a77a7a 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -63,8 +63,8 @@ extern	void nfs_release_request(struct nfs_page *req);
 
 extern  int nfs_scan_lock_dirty(struct nfs_inode *nfsi, struct list_head *dst,
                                 unsigned long idx_start, unsigned int npages);
-extern  int nfs_scan_list(struct list_head *, struct list_head *,
-                          unsigned long, unsigned int);
+extern  int nfs_scan_list(struct nfs_inode *nfsi, struct list_head *head, struct list_head *dst,
+                          unsigned long idx_start, unsigned int npages);
 extern  int nfs_coalesce_requests(struct list_head *, struct list_head *,
                                   unsigned int);
 extern  int nfs_wait_on_request(struct nfs_page *);