diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 03:45:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-04 03:45:54 -0400 |
| commit | b1330031b76bf1c9dc23635e016625aa9edc069a (patch) | |
| tree | e4f104e387fa249df7c1eb18b5a57a0cec6f727b /fs/nfs/file.c | |
| parent | ea3c4b126ad63bd782c7bb5266bb4fd88e203169 (diff) | |
| parent | 1b3b4a1a2deb7d3e5d66063bd76304d840c966b3 (diff) | |
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.c | 2 |
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) | |||
| 316 | if (offset != 0) | 316 | if (offset != 0) |
| 317 | return; | 317 | return; |
| 318 | /* Cancel any unstarted writes on this page */ | 318 | /* Cancel any unstarted writes on this page */ |
| 319 | nfs_wb_page_priority(page->mapping->host, page, FLUSH_INVALIDATE); | 319 | nfs_wb_page_cancel(page->mapping->host, page); |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | static int nfs_release_page(struct page *page, gfp_t gfp) | 322 | static int nfs_release_page(struct page *page, gfp_t gfp) |