From: Andy Adamson <andros@xxxxxxxxxx>
Retry I/O from the call prepare state (with the new stateid) if the stateid
has changed on an stateid expired error
Fail the I/O if the statied represents a lost lock.
Otherwise, let the error handler decide what to do.
Without this change, I/O with a stateid expired error such as
NFS4ERR_BAD_STATEID can be retried without recovery and loop forever.
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/nfs4proc.c | 77 +++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 60 insertions(+), 17 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2f1997d..de8e7f5 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4107,29 +4107,49 @@ static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_read_data *data)
return 0;
}
-static bool nfs4_read_stateid_changed(struct rpc_task *task,
+static int nfs4_read_stateid_changed(struct rpc_task *task,
struct nfs_readargs *args)
{
+ int ret;
- if (!nfs4_error_stateid_expired(task->tk_status) ||
- nfs4_stateid_is_current(&args->stateid,
+ ret = nfs4_stateid_is_current(&args->stateid,
args->context,
args->lock_context,
- FMODE_READ))
- return false;
- rpc_restart_call_prepare(task);
- return true;
+ FMODE_READ);
+ switch (ret) {
+ case 0: /* stateid changed */
+ if (nfs4_error_stateid_expired(task->tk_status)) {
+ /* stateid expired error, retry with changed stateid */
+ rpc_restart_call_prepare(task);
+ return -EAGAIN;
+ }
+ return 0; /* let error handler proceed */
+
+ case -EIO: /* -EIO means lock stateid was lost: fail the I/O */
+ task->tk_status = -EIO;
+ return -EIO;
+
+ case -EWOULDBLOCK: /* stateid change in progress */
+ default:/* stateid has not changed, let error handler proceed.*/
+ return 0;
+
+ }
}
static int nfs4_read_done(struct rpc_task *task, struct nfs_read_data *data)
{
+ int ret;
dprintk("--> %s\n", __func__);
if (!nfs4_sequence_done(task, &data->res.seq_res))
return -EAGAIN;
- if (nfs4_read_stateid_changed(task, &data->args))
- return -EAGAIN;
+ ret = nfs4_read_stateid_changed(task, &data->args);
+ switch (ret) {
+ case -EAGAIN:
+ case -EIO:
+ return ret;
+ }
return data->read_done_cb ? data->read_done_cb(task, data) :
nfs4_read_done_cb(task, data);
}
@@ -4176,23 +4196,46 @@ static int nfs4_write_done_cb(struct rpc_task *task, struct nfs_write_data *data
static bool nfs4_write_stateid_changed(struct rpc_task *task,
struct nfs_writeargs *args)
{
+ int ret;
- if (!nfs4_error_stateid_expired(task->tk_status) ||
- nfs4_stateid_is_current(&args->stateid,
+ ret = nfs4_stateid_is_current(&args->stateid,
args->context,
args->lock_context,
- FMODE_WRITE))
- return false;
- rpc_restart_call_prepare(task);
- return true;
+ FMODE_WRITE);
+
+ switch (ret) {
+ case 0: /* stateid changed */
+ if (nfs4_error_stateid_expired(task->tk_status)) {
+ /* stateid expired error, retry with changed stateid */
+ rpc_restart_call_prepare(task);
+ return -EAGAIN;
+ }
+ return 0; /* let error handler proceed */
+
+ case -EIO: /* -EIO means lock stateid was lost: fail the I/O */
+ task->tk_status = -EIO;
+ return -EIO;
+
+ case -EWOULDBLOCK: /* stateid change in progress */
+ default:/* stateid has not changed, let error handler proceed.*/
+ return 0;
+
+ }
}
static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)
{
+ int ret;
+
if (!nfs4_sequence_done(task, &data->res.seq_res))
return -EAGAIN;
- if (nfs4_write_stateid_changed(task, &data->args))
- return -EAGAIN;
+
+ ret = nfs4_write_stateid_changed(task, &data->args);
+ switch (ret) {
+ case -EAGAIN:
+ case -EIO:
+ return ret;
+ }
return data->write_done_cb ? data->write_done_cb(task, data) :
nfs4_write_done_cb(task, data);
}
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
