Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

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

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 16f57e0af999a51dc166b181dd01c3e8ef72e79d..f856004bb7fa3c8ed4bfe99c3c61ccd6d5729861 100644 (file)
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -329,7 +329,7 @@ int nfs_readpage_result(struct rpc_task *task, struct nfs_read_data *data)
 {
        int status;
 
-       dprintk("NFS: %s: %5u, (status %d)\n", __FUNCTION__, task->tk_pid,
+       dprintk("NFS: %s: %5u, (status %d)\n", __func__, task->tk_pid,
                        task->tk_status);
 
        status = NFS_PROTO(data->inode)->read_done(task, data);
@@ -533,12 +533,6 @@ readpage_async_filler(void *data, struct page *page)
        unsigned int len;
        int error;
 
-       error = nfs_wb_page(inode, page);
-       if (error)
-               goto out_unlock;
-       if (PageUptodate(page))
-               goto out_unlock;
-
        len = nfs_page_length(page);
        if (len == 0)
                return nfs_return_empty_page(page);