aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/file.c
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 /fs/nfs/file.c
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff)
parentNFS: Fix a write request leak in nfs_invalidate_page() (diff)
downloadlinux-dev-b1330031b76bf1c9dc23635e016625aa9edc069a.tar.xz
linux-dev-b1330031b76bf1c9dc23635e016625aa9edc069a.zip
Merge branch 'for_linus' of git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index c87dc713b5d7..579cf8a7d4a7 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -316,7 +316,7 @@ static void nfs_invalidate_page(struct page *page, unsigned long offset)
if (offset != 0)
return;
/* Cancel any unstarted writes on this page */
- nfs_wb_page_priority(page->mapping->host, page, FLUSH_INVALIDATE);
+ nfs_wb_page_cancel(page->mapping->host, page);
}
static int nfs_release_page(struct page *page, gfp_t gfp)