NFS: Create a common pgio_error function

At this point, the read and write versions of this function look
identical so both should use the same function.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

1 files changed, 4 insertions, 21 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0d367aa87814..02d088b1d8e4 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1044,19 +1044,6 @@ static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops = {
         .completion = nfs_write_completion,
 };
 
-static void nfs_flush_error(struct nfs_pageio_descriptor *desc,
-                struct nfs_pgio_header *hdr)
-{
-        set_bit(NFS_IOHDR_REDO, &hdr->flags);
-        while (!list_empty(&hdr->rpc_list)) {
-                struct nfs_pgio_data *data = list_first_entry(&hdr->rpc_list,
-                                struct nfs_pgio_data, list);
-                list_del(&data->list);
-                nfs_pgio_data_release(data);
-        }
-        desc->pg_completion_ops->error_cleanup(&desc->pg_list);
-}
-
 /*
  * Generate multiple small requests to write out a single
  * contiguous dirty area on one page.
@@ -1086,10 +1073,8 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc,
                 size_t len = min(nbytes, wsize);
 
                 data = nfs_pgio_data_alloc(hdr, 1);
-                if (!data) {
-                        nfs_flush_error(desc, hdr);
-                        return -ENOMEM;
-                }
+                if (!data)
+                        return nfs_pgio_error(desc, hdr);
                 data->pages.pagevec[0] = page;
                 nfs_pgio_rpcsetup(data, len, offset, desc->pg_ioflags, &cinfo);
                 list_add(&data->list, &hdr->rpc_list);
@@ -1122,10 +1107,8 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc,
 
         data = nfs_pgio_data_alloc(hdr, nfs_page_array_len(desc->pg_base,
                                                            desc->pg_count));
-        if (!data) {
-                nfs_flush_error(desc, hdr);
-                return -ENOMEM;
-        }
+        if (!data)
+                return nfs_pgio_error(desc, hdr);
 
         nfs_init_cinfo(&cinfo, desc->pg_inode, desc->pg_dreq);
         pages = data->pages.pagevec;