diff --git a/[refs] b/[refs] index de2951b37bfa..c3352ec3ef79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f16c960332b125491178fc2da7ea7893b0d65d05 +refs/heads/master: 5334eb13d455dd26b7064980b118e3c957929701 diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 89527a487ed7..51cc1bd6a116 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -1436,7 +1436,8 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page) return ret; } -int nfs_wb_page_priority(struct inode *inode, struct page *page, int how) +static int nfs_wb_page_priority(struct inode *inode, struct page *page, + int how) { loff_t range_start = page_offset(page); loff_t range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1); diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h index e82a6ebc725d..2d15d4aac094 100644 --- a/trunk/include/linux/nfs_fs.h +++ b/trunk/include/linux/nfs_fs.h @@ -422,7 +422,6 @@ extern long nfs_sync_mapping_wait(struct address_space *, struct writeback_contr extern int nfs_wb_all(struct inode *inode); extern int nfs_wb_nocommit(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);