Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / nfs / write.c

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index e8f675d4b2fb30a9db9864f504b0a88f7c0897db..3612b4622337bb3ea3c4c5ff3b72ae6ae2e78e24 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1876,11 +1876,6 @@ int nfs_wb_page_cancel(struct inode *inode, struct page *page)
                 * request from the inode / page_private pointer and
                 * release it */
                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);
        }