NFSv4.1 set RPC_TASK_SOFTCONN for filelayout DS RPC calls

RPC_TASK_SOFTCONN returns connection errors to the caller which allows the pNFS
file layout to quickly try the MDS or perhaps another DS.

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

4 files changed, 19 insertions, 16 deletions

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index bf64095f850d..6ed96c7ffcb2 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -299,7 +299,7 @@ extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio,
                         const struct nfs_pgio_completion_ops *compl_ops);
 extern int nfs_initiate_read(struct rpc_clnt *clnt,
                              struct nfs_read_data *data,
-                             const struct rpc_call_ops *call_ops);
+                             const struct rpc_call_ops *call_ops, int flags);
 extern void nfs_read_prepare(struct rpc_task *task, void *calldata);
 extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,
                               struct nfs_pgio_header *hdr);
@@ -326,13 +326,13 @@ extern void nfs_commit_free(struct nfs_commit_data *p);
 extern int nfs_initiate_write(struct rpc_clnt *clnt,
                               struct nfs_write_data *data,
                               const struct rpc_call_ops *call_ops,
-                              int how);
+                              int how, int flags);
 extern void nfs_write_prepare(struct rpc_task *task, void *calldata);
 extern void nfs_commit_prepare(struct rpc_task *task, void *calldata);
 extern int nfs_initiate_commit(struct rpc_clnt *clnt,
                                struct nfs_commit_data *data,
                                const struct rpc_call_ops *call_ops,
-                               int how);
+                               int how, int flags);
 extern void nfs_init_commit(struct nfs_commit_data *data,
                             struct list_head *head,
                             struct pnfs_layout_segment *lseg,
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index b9edc8870561..0db8c0783039 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -401,7 +401,7 @@ filelayout_read_pagelist(struct nfs_read_data *data)
 
         /* Perform an asynchronous read to ds */
         status = nfs_initiate_read(ds->ds_clp->cl_rpcclient, data,
-                                   &filelayout_read_call_ops);
+                                  &filelayout_read_call_ops, RPC_TASK_SOFTCONN);
         BUG_ON(status != 0);
         return PNFS_ATTEMPTED;
 }
@@ -441,7 +441,8 @@ filelayout_write_pagelist(struct nfs_write_data *data, int sync)
 
         /* Perform an asynchronous write */
         status = nfs_initiate_write(ds->ds_clp->cl_rpcclient, data,
-                                    &filelayout_write_call_ops, sync);
+                                    &filelayout_write_call_ops, sync,
+                                    RPC_TASK_SOFTCONN);
         BUG_ON(status != 0);
         return PNFS_ATTEMPTED;
 }
@@ -966,7 +967,8 @@ static int filelayout_initiate_commit(struct nfs_commit_data *data, int how)
         if (fh)
                 data->args.fh = fh;
         return nfs_initiate_commit(ds->ds_clp->cl_rpcclient, data,
-                                   &filelayout_commit_call_ops, how);
+                                   &filelayout_commit_call_ops, how,
+                                   RPC_TASK_SOFTCONN);
 }
 
 static int
@@ -1120,7 +1122,7 @@ filelayout_commit_pagelist(struct inode *inode, struct list_head *mds_pages,
                 if (!data->lseg) {
                         nfs_init_commit(data, mds_pages, NULL, cinfo);
                         nfs_initiate_commit(NFS_CLIENT(inode), data,
-                                            data->mds_ops, how);
+                                            data->mds_ops, how, 0);
                 } else {
                         struct pnfs_commit_bucket *buckets;
 
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index f23cf255bd39..2cfdd7785411 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -206,7 +206,7 @@ out:
 
 int nfs_initiate_read(struct rpc_clnt *clnt,
                       struct nfs_read_data *data,
-                      const struct rpc_call_ops *call_ops)
+                      const struct rpc_call_ops *call_ops, int flags)
 {
         struct inode *inode = data->header->inode;
         int swap_flags = IS_SWAPFILE(inode) ? NFS_RPC_SWAPFLAGS : 0;
@@ -223,7 +223,7 @@ int nfs_initiate_read(struct rpc_clnt *clnt,
                 .callback_ops = call_ops,
                 .callback_data = data,
                 .workqueue = nfsiod_workqueue,
-                .flags = RPC_TASK_ASYNC | swap_flags,
+                .flags = RPC_TASK_ASYNC | swap_flags | flags,
         };
 
         /* Set up the initial task struct. */
@@ -272,7 +272,7 @@ static int nfs_do_read(struct nfs_read_data *data,
 {
         struct inode *inode = data->header->inode;
 
-        return nfs_initiate_read(NFS_CLIENT(inode), data, call_ops);
+        return nfs_initiate_read(NFS_CLIENT(inode), data, call_ops, 0);
 }
 
 static int
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 8ffd7d5ed58b..e6fe3d69d14c 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -916,7 +916,7 @@ static int flush_task_priority(int how)
 int nfs_initiate_write(struct rpc_clnt *clnt,
                        struct nfs_write_data *data,
                        const struct rpc_call_ops *call_ops,
-                       int how)
+                       int how, int flags)
 {
         struct inode *inode = data->header->inode;
         int priority = flush_task_priority(how);
@@ -933,7 +933,7 @@ int nfs_initiate_write(struct rpc_clnt *clnt,
                 .callback_ops = call_ops,
                 .callback_data = data,
                 .workqueue = nfsiod_workqueue,
-                .flags = RPC_TASK_ASYNC,
+                .flags = RPC_TASK_ASYNC | flags,
                 .priority = priority,
         };
         int ret = 0;
@@ -1009,7 +1009,7 @@ static int nfs_do_write(struct nfs_write_data *data,
 {
         struct inode *inode = data->header->inode;
 
-        return nfs_initiate_write(NFS_CLIENT(inode), data, call_ops, how);
+        return nfs_initiate_write(NFS_CLIENT(inode), data, call_ops, how, 0);
 }
 
 static int nfs_do_multiple_writes(struct list_head *head,
@@ -1394,7 +1394,7 @@ EXPORT_SYMBOL_GPL(nfs_commitdata_release);
 
 int nfs_initiate_commit(struct rpc_clnt *clnt, struct nfs_commit_data *data,
                         const struct rpc_call_ops *call_ops,
-                        int how)
+                        int how, int flags)
 {
         struct rpc_task *task;
         int priority = flush_task_priority(how);
@@ -1410,7 +1410,7 @@ int nfs_initiate_commit(struct rpc_clnt *clnt, struct nfs_commit_data *data,
                 .callback_ops = call_ops,
                 .callback_data = data,
                 .workqueue = nfsiod_workqueue,
-                .flags = RPC_TASK_ASYNC,
+                .flags = RPC_TASK_ASYNC | flags,
                 .priority = priority,
         };
         /* Set up the initial task struct.  */
@@ -1499,7 +1499,8 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how,
         /* Set up the argument struct */
         nfs_init_commit(data, head, NULL, cinfo);
         atomic_inc(&cinfo->mds->rpcs_out);
-        return nfs_initiate_commit(NFS_CLIENT(inode), data, data->mds_ops, how);
+        return nfs_initiate_commit(NFS_CLIENT(inode), data, data->mds_ops,
+                                   how, 0);
  out_bad:
         nfs_retry_commit(head, NULL, cinfo);
         cinfo->completion_ops->error_cleanup(NFS_I(inode));