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

[~andy/linux] / fs / nfs / nfs4filelayout.c

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 20a56fa271bd5213cfde186f9c2fdd3feb69c5f5..b9a35c05b60f7f418ce91443d46dab88c690ca69 100644 (file)
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -324,8 +324,9 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data)
                        &rdata->res.seq_res,
                        task))
                return;
-       nfs4_set_rw_stateid(&rdata->args.stateid, rdata->args.context,
-                       rdata->args.lock_context, FMODE_READ);
+       if (nfs4_set_rw_stateid(&rdata->args.stateid, rdata->args.context,
+                       rdata->args.lock_context, FMODE_READ) == -EIO)
+               rpc_exit(task, -EIO); /* lost lock, terminate I/O */
 }
 
 static void filelayout_read_call_done(struct rpc_task *task, void *data)
@@ -336,8 +337,7 @@ static void filelayout_read_call_done(struct rpc_task *task, void *data)
 
        if (test_bit(NFS_IOHDR_REDO, &rdata->header->flags) &&
            task->tk_status == 0) {
-               if (rdata->res.seq_res.sr_slot != NULL)
-                       nfs41_sequence_done(task, &rdata->res.seq_res);
+               nfs41_sequence_done(task, &rdata->res.seq_res);
                return;
        }
 
@@ -436,8 +436,9 @@ static void filelayout_write_prepare(struct rpc_task *task, void *data)
                        &wdata->res.seq_res,
                        task))
                return;
-       nfs4_set_rw_stateid(&wdata->args.stateid, wdata->args.context,
-                       wdata->args.lock_context, FMODE_WRITE);
+       if (nfs4_set_rw_stateid(&wdata->args.stateid, wdata->args.context,
+                       wdata->args.lock_context, FMODE_WRITE) == -EIO)
+               rpc_exit(task, -EIO); /* lost lock, terminate I/O */
 }
 
 static void filelayout_write_call_done(struct rpc_task *task, void *data)
@@ -446,8 +447,7 @@ static void filelayout_write_call_done(struct rpc_task *task, void *data)
 
        if (test_bit(NFS_IOHDR_REDO, &wdata->header->flags) &&
            task->tk_status == 0) {
-               if (wdata->res.seq_res.sr_slot != NULL)
-                       nfs41_sequence_done(task, &wdata->res.seq_res);
+               nfs41_sequence_done(task, &wdata->res.seq_res);
                return;
        }