diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-05 00:35:42 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-06 10:46:40 -0500 |
commit | 61822ab5e3ed09fcfc49e37227b655202adf6130 (patch) | |
tree | 224a470689463469672ed38b0da3d9f47bc8a245 /fs/nfs/file.c | |
parent | e261f51f25b98c213e0b3d7f2109b117d714f69d (diff) |
NFS: Ensure we only call set_page_writeback() under the page lock
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r-- | fs/nfs/file.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index c2fe3bd83ab1..238fb6641aae 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -307,14 +307,10 @@ static int nfs_commit_write(struct file *file, struct page *page, unsigned offse | |||
307 | 307 | ||
308 | static void nfs_invalidate_page(struct page *page, unsigned long offset) | 308 | static void nfs_invalidate_page(struct page *page, unsigned long offset) |
309 | { | 309 | { |
310 | loff_t range_start, range_end; | ||
311 | |||
312 | if (offset != 0) | 310 | if (offset != 0) |
313 | return; | 311 | return; |
314 | /* Cancel any unstarted writes on this page */ | 312 | /* Cancel any unstarted writes on this page */ |
315 | range_start = page_offset(page); | 313 | nfs_wb_page_priority(page->mapping->host, page, FLUSH_INVALIDATE); |
316 | range_end = range_start + (loff_t)(PAGE_CACHE_SIZE - 1); | ||
317 | nfs_sync_mapping_range(page->mapping, range_start, range_end, FLUSH_INVALIDATE); | ||
318 | } | 314 | } |
319 | 315 | ||
320 | static int nfs_release_page(struct page *page, gfp_t gfp) | 316 | static int nfs_release_page(struct page *page, gfp_t gfp) |