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

[linux.git] / fs / nfs / write.c

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 52cab65f91cf08460a926d45c1dddb40cc885a69..c478b772cc49a3a583611612ef54714cfbea5437 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -243,13 +243,24 @@ static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int c
 /* A writeback failed: mark the page as bad, and invalidate the page cache */
 static void nfs_set_pageerror(struct address_space *mapping)
 {
+       struct inode *inode = mapping->host;
+
        nfs_zap_mapping(mapping->host, mapping);
+       /* Force file size revalidation */
+       spin_lock(&inode->i_lock);
+       NFS_I(inode)->cache_validity |= NFS_INO_REVAL_FORCED |
+                                       NFS_INO_REVAL_PAGECACHE |
+                                       NFS_INO_INVALID_SIZE;
+       spin_unlock(&inode->i_lock);
 }
 
 static void nfs_mapping_set_error(struct page *page, int error)
 {
+       struct address_space *mapping = page_file_mapping(page);
+
        SetPageError(page);
-       mapping_set_error(page_file_mapping(page), error);
+       mapping_set_error(mapping, error);
+       nfs_set_pageerror(mapping);
 }
 
 /*
@@ -592,7 +603,7 @@ nfs_lock_and_join_requests(struct page *page)
 
 static void nfs_write_error(struct nfs_page *req, int error)
 {
-       nfs_set_pageerror(page_file_mapping(req->wb_page));
+       trace_nfs_write_error(req, error);
        nfs_mapping_set_error(req->wb_page, error);
        nfs_inode_remove_request(req);
        nfs_end_page_writeback(req);
@@ -998,7 +1009,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
                nfs_list_remove_request(req);
                if (test_bit(NFS_IOHDR_ERROR, &hdr->flags) &&
                    (hdr->good_bytes < bytes)) {
-                       nfs_set_pageerror(page_file_mapping(req->wb_page));
+                       trace_nfs_comp_error(req, hdr->error);
                        nfs_mapping_set_error(req->wb_page, hdr->error);
                        goto remove_req;
                }
@@ -1403,8 +1414,7 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr,
 
        task_setup_data->priority = priority;
        rpc_ops->write_setup(hdr, msg, &task_setup_data->rpc_client);
-       trace_nfs_initiate_write(hdr->inode, hdr->io_start, hdr->good_bytes,
-                                hdr->args.stable);
+       trace_nfs_initiate_write(hdr);
 }
 
 /* If a nfs_flush_* function fails, it should remove reqs from @head and
@@ -1568,8 +1578,7 @@ static int nfs_writeback_done(struct rpc_task *task,
                return status;
 
        nfs_add_stats(inode, NFSIOS_SERVERWRITTENBYTES, hdr->res.count);
-       trace_nfs_writeback_done(inode, task->tk_status,
-                                hdr->args.offset, hdr->res.verf);
+       trace_nfs_writeback_done(task, hdr);
 
        if (hdr->res.verf->committed < hdr->args.stable &&
            task->tk_status >= 0) {
@@ -1649,6 +1658,8 @@ static void nfs_writeback_result(struct rpc_task *task,
                         */
                        argp->stable = NFS_FILE_SYNC;
                }
+               resp->count = 0;
+               resp->verf->committed = 0;
                rpc_restart_call_prepare(task);
        }
 }
@@ -1824,11 +1835,12 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata)
 
        /* Call the NFS version-specific code */
        NFS_PROTO(data->inode)->commit_done(task, data);
-       trace_nfs_commit_done(data);
+       trace_nfs_commit_done(task, data);
 }
 
 static void nfs_commit_release_pages(struct nfs_commit_data *data)
 {
+       const struct nfs_writeverf *verf = data->res.verf;
        struct nfs_page *req;
        int status = data->task.tk_status;
        struct nfs_commit_info cinfo;
@@ -1847,6 +1859,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
                        (long long)req_offset(req));
                if (status < 0) {
                        if (req->wb_page) {
+                               trace_nfs_commit_error(req, status);
                                nfs_mapping_set_error(req->wb_page, status);
                                nfs_inode_remove_request(req);
                        }
@@ -1856,7 +1869,8 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
 
                /* Okay, COMMIT succeeded, apparently. Check the verifier
                 * returned by the server against all stored verfs. */
-               if (!nfs_write_verifier_cmp(&req->wb_verf, &data->verf.verifier)) {
+               if (verf->committed > NFS_UNSTABLE &&
+                   !nfs_write_verifier_cmp(&req->wb_verf, &verf->verifier)) {
                        /* We have a match */
                        if (req->wb_page)
                                nfs_inode_remove_request(req);