Merge branch 'akpm' (patches from Andrew)

[karo-tx-linux.git] / fs / nfs / direct.c

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index c1b5fed7c863b2b730e46f0139a7b6f9a5f68fa0..6fb9fad2d1e6cf6909cfe6dfb2e482bff969e7df 100644 (file)
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -392,16 +392,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq)
        nfs_direct_req_release(dreq);
 }
 
-static void nfs_direct_readpage_release(struct nfs_page *req)
-{
-       dprintk("NFS: direct read done (%s/%llu %d@%lld)\n",
-               req->wb_context->dentry->d_sb->s_id,
-               (unsigned long long)NFS_FILEID(d_inode(req->wb_context->dentry)),
-               req->wb_bytes,
-               (long long)req_offset(req));
-       nfs_release_request(req);
-}
-
 static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)
 {
        unsigned long bytes = 0;
@@ -426,7 +416,7 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)
                        set_page_dirty(page);
                bytes += req->wb_bytes;
                nfs_list_remove_request(req);
-               nfs_direct_readpage_release(req);
+               nfs_release_request(req);
        }
 out_put:
        if (put_dreq(dreq))
@@ -700,16 +690,9 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)
        int status = data->task.tk_status;
 
        nfs_init_cinfo_from_dreq(&cinfo, dreq);
-       if (status < 0) {
-               dprintk("NFS: %5u commit failed with error %d.\n",
-                       data->task.tk_pid, status);
-               dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
-       } else if (nfs_direct_cmp_commit_data_verf(dreq, data)) {
-               dprintk("NFS: %5u commit verify failed\n", data->task.tk_pid);
+       if (status < 0 || nfs_direct_cmp_commit_data_verf(dreq, data))
                dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
-       }
 
-       dprintk("NFS: %5u commit returned %d\n", data->task.tk_pid, status);
        while (!list_empty(&data->pages)) {
                req = nfs_list_entry(data->pages.next);
                nfs_list_remove_request(req);