diff options
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/file.c | 13 | ||||
-rw-r--r-- | fs/nfs/pagelist.c | 10 |
2 files changed, 21 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 7a79fbe9f539..387809f2d188 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -316,6 +316,17 @@ static int nfs_commit_write(struct file *file, struct page *page, unsigned offse | |||
316 | return status; | 316 | return status; |
317 | } | 317 | } |
318 | 318 | ||
319 | static int nfs_invalidate_page(struct page *page, unsigned long offset) | ||
320 | { | ||
321 | /* FIXME: we really should cancel any unstarted writes on this page */ | ||
322 | return 1; | ||
323 | } | ||
324 | |||
325 | static int nfs_release_page(struct page *page, gfp_t gfp) | ||
326 | { | ||
327 | return !nfs_wb_page(page->mapping->host, page); | ||
328 | } | ||
329 | |||
319 | struct address_space_operations nfs_file_aops = { | 330 | struct address_space_operations nfs_file_aops = { |
320 | .readpage = nfs_readpage, | 331 | .readpage = nfs_readpage, |
321 | .readpages = nfs_readpages, | 332 | .readpages = nfs_readpages, |
@@ -324,6 +335,8 @@ struct address_space_operations nfs_file_aops = { | |||
324 | .writepages = nfs_writepages, | 335 | .writepages = nfs_writepages, |
325 | .prepare_write = nfs_prepare_write, | 336 | .prepare_write = nfs_prepare_write, |
326 | .commit_write = nfs_commit_write, | 337 | .commit_write = nfs_commit_write, |
338 | .invalidatepage = nfs_invalidate_page, | ||
339 | .releasepage = nfs_release_page, | ||
327 | #ifdef CONFIG_NFS_DIRECTIO | 340 | #ifdef CONFIG_NFS_DIRECTIO |
328 | .direct_IO = nfs_direct_IO, | 341 | .direct_IO = nfs_direct_IO, |
329 | #endif | 342 | #endif |
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index d53857b148e2..d6e076c9dbe1 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -85,6 +85,10 @@ nfs_create_request(struct nfs_open_context *ctx, struct inode *inode, | |||
85 | atomic_set(&req->wb_complete, 0); | 85 | atomic_set(&req->wb_complete, 0); |
86 | req->wb_index = page->index; | 86 | req->wb_index = page->index; |
87 | page_cache_get(page); | 87 | page_cache_get(page); |
88 | BUG_ON(PagePrivate(page)); | ||
89 | BUG_ON(!PageLocked(page)); | ||
90 | BUG_ON(page->mapping->host != inode); | ||
91 | SetPagePrivate(page); | ||
88 | req->wb_offset = offset; | 92 | req->wb_offset = offset; |
89 | req->wb_pgbase = offset; | 93 | req->wb_pgbase = offset; |
90 | req->wb_bytes = count; | 94 | req->wb_bytes = count; |
@@ -147,8 +151,10 @@ void nfs_clear_page_writeback(struct nfs_page *req) | |||
147 | */ | 151 | */ |
148 | void nfs_clear_request(struct nfs_page *req) | 152 | void nfs_clear_request(struct nfs_page *req) |
149 | { | 153 | { |
150 | if (req->wb_page) { | 154 | struct page *page = req->wb_page; |
151 | page_cache_release(req->wb_page); | 155 | if (page != NULL) { |
156 | ClearPagePrivate(page); | ||
157 | page_cache_release(page); | ||
152 | req->wb_page = NULL; | 158 | req->wb_page = NULL; |
153 | } | 159 | } |
154 | } | 160 | } |