| Message ID | 20130708095206.13810.31538.stgit@zurg (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index a2c7c28..737981f 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1735,11 +1735,6 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page) if (nfs_lock_request(req)) { nfs_clear_request_commit(req); nfs_inode_remove_request(req); - /* - * In case nfs_inode_remove_request has marked the - * page as being dirty - */ - cancel_dirty_page(page, PAGE_CACHE_SIZE); nfs_unlock_and_release_request(req); break; }
This chunk was added by commit 1b3b4a1a2deb7d3e5d66063bd76304d840c966b3 ("NFS: Fix a write request leak in nfs_invalidate_page()") in kernel 2.6.23, as fix for problem introduced in commit 3e67c0987d7567ad666641164a153dca9a43b11d ("[PATCH] truncate: clear page dirtiness before running try_to_free_buffers()") in v2.6.20, which has placed cancel_dirty_page() in truncate_complete_page() before calling do_invalidatepage(). But that change in truncate_complete_page() was reverted by commit a2b345642f530054a92b8d2b5108436225a8093e in v2.6.25 ("Fix dirty page accounting leak with ext3 data=journal"). Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Cc: linux-nfs@vger.kernel.org --- fs/nfs/write.c | 5 ----- 1 file changed, 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html