aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2007-09-04 00:45:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2007-09-04 00:45:54 -0700
commitb1330031b76bf1c9dc23635e016625aa9edc069a (patch)
treee4f104e387fa249df7c1eb18b5a57a0cec6f727b /include
parentea3c4b126ad63bd782c7bb5266bb4fd88e203169 (diff)
parent1b3b4a1a2deb7d3e5d66063bd76304d840c966b3 (diff)
downloadlinux-linaro-b1330031b76bf1c9dc23635e016625aa9edc069a.tar.gz
Merge branch 'for_linus' of git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_fs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 157dcb055b5..7250eeadd7b 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -431,6 +431,7 @@ extern int nfs_sync_mapping_range(struct address_space *, loff_t, loff_t, int);
extern int nfs_wb_all(struct inode *inode);
extern int nfs_wb_page(struct inode *inode, struct page* page);
extern int nfs_wb_page_priority(struct inode *inode, struct page* page, int how);
+extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
extern int nfs_commit_inode(struct inode *, int);
extern struct nfs_write_data *nfs_commit_alloc(void);