1 files changed, 31 insertions, 10 deletions

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 194c48410336..22d10623f5ee 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -99,7 +99,8 @@ static void filelayout_reset_write(struct nfs_write_data *data)
 
                 task->tk_status = pnfs_write_done_resend_to_mds(hdr->inode,
                                                         &hdr->pages,
-                                                        hdr->completion_ops);
+                                                        hdr->completion_ops,
+                                                        hdr->dreq);
         }
 }
 
@@ -119,7 +120,8 @@ static void filelayout_reset_read(struct nfs_read_data *data)
 
                 task->tk_status = pnfs_read_done_resend_to_mds(hdr->inode,
                                                         &hdr->pages,
-                                                        hdr->completion_ops);
+                                                        hdr->completion_ops,
+                                                        hdr->dreq);
         }
 }
 
@@ -127,7 +129,6 @@ static void filelayout_fenceme(struct inode *inode, struct pnfs_layout_hdr *lo)
 {
         if (!test_and_clear_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))
                 return;
-        clear_bit(NFS_INO_LAYOUTCOMMIT, &NFS_I(inode)->flags);
         pnfs_return_layout(inode);
 }
 
@@ -157,11 +158,14 @@ static int filelayout_async_handle_error(struct rpc_task *task,
         case -NFS4ERR_OPENMODE:
                 if (state == NULL)
                         break;
-                nfs4_schedule_stateid_recovery(mds_server, state);
+                if (nfs4_schedule_stateid_recovery(mds_server, state) < 0)
+                        goto out_bad_stateid;
                 goto wait_on_recovery;
         case -NFS4ERR_EXPIRED:
-                if (state != NULL)
-                        nfs4_schedule_stateid_recovery(mds_server, state);
+                if (state != NULL) {
+                        if (nfs4_schedule_stateid_recovery(mds_server, state) < 0)
+                                goto out_bad_stateid;
+                }
                 nfs4_schedule_lease_recovery(mds_client);
                 goto wait_on_recovery;
         /* DS session errors */
@@ -225,6 +229,9 @@ reset:
 out:
         task->tk_status = 0;
         return -EAGAIN;
+out_bad_stateid:
+        task->tk_status = -EIO;
+        return 0;
 wait_on_recovery:
         rpc_sleep_on(&mds_client->cl_rpcwaitq, task, NULL);
         if (test_bit(NFS4CLNT_MANAGER_RUNNING, &mds_client->cl_state) == 0)
@@ -298,6 +305,10 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data)
 {
         struct nfs_read_data *rdata = data;
 
+        if (unlikely(test_bit(NFS_CONTEXT_BAD, &rdata->args.context->flags))) {
+                rpc_exit(task, -EIO);
+                return;
+        }
         if (filelayout_reset_to_mds(rdata->header->lseg)) {
                 dprintk("%s task %u reset io to MDS\n", __func__, task->tk_pid);
                 filelayout_reset_read(rdata);
@@ -306,10 +317,13 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data)
         }
         rdata->read_done_cb = filelayout_read_done_cb;
 
-        nfs41_setup_sequence(rdata->ds_clp->cl_session,
+        if (nfs41_setup_sequence(rdata->ds_clp->cl_session,
                         &rdata->args.seq_args,
                         &rdata->res.seq_res,
-                        task);
+                        task))
+                return;
+        nfs4_set_rw_stateid(&rdata->args.stateid, rdata->args.context,
+                        rdata->args.lock_context, FMODE_READ);
 }
 
 static void filelayout_read_call_done(struct rpc_task *task, void *data)
@@ -400,16 +414,23 @@ static void filelayout_write_prepare(struct rpc_task *task, void *data)
 {
         struct nfs_write_data *wdata = data;
 
+        if (unlikely(test_bit(NFS_CONTEXT_BAD, &wdata->args.context->flags))) {
+                rpc_exit(task, -EIO);
+                return;
+        }
         if (filelayout_reset_to_mds(wdata->header->lseg)) {
                 dprintk("%s task %u reset io to MDS\n", __func__, task->tk_pid);
                 filelayout_reset_write(wdata);
                 rpc_exit(task, 0);
                 return;
         }
-        nfs41_setup_sequence(wdata->ds_clp->cl_session,
+        if (nfs41_setup_sequence(wdata->ds_clp->cl_session,
                         &wdata->args.seq_args,
                         &wdata->res.seq_res,
-                        task);
+                        task))
+                return;
+        nfs4_set_rw_stateid(&wdata->args.stateid, wdata->args.context,
+                        wdata->args.lock_context, FMODE_WRITE);
 }
 
 static void filelayout_write_call_done(struct rpc_task *task, void *data)