Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[linux-2.6-omap-h63xx.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index c87dc713b5d75828e53f2f305083004c0440ed17..579cf8a7d4a75177a0a04a3baf615c0aa1ac4494 100644 (file)
--- 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)
        if (offset != 0)
                return;
        /* Cancel any unstarted writes on this page */
-       nfs_wb_page_priority(page->mapping->host, page, FLUSH_INVALIDATE);
+       nfs_wb_page_cancel(page->mapping->host, page);
 }
 
 static int nfs_release_page(struct page *page, gfp_t gfp)