If we sent an operation to the "DS" and got an error, the code resends
to "MDS" but when they are the same, it gets the same error and goes
into the infinite loop. Example was COMMIT getting EACCES.
Signed-off-by: Olga Kornievskaia <kolga@xxxxxxxxxx>
---
fs/nfs/filelayout/filelayout.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 44347f4..5276abe 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -207,6 +207,9 @@ static int filelayout_async_handle_error(struct rpc_task *task,
/* fall through */
default:
reset:
+ if (clp->cl_exchange_flags & EXCHGID4_FLAG_USE_PNFS_MDS &&
+ clp->cl_exchange_flags & EXCHGID4_FLAG_USE_PNFS_DS)
+ return task->tk_status;
dprintk("%s Retry through MDS. Error %d\n", __func__,
task->tk_status);
return -NFS4ERR_RESET_TO_MDS;
@@ -384,9 +387,10 @@ static int filelayout_commit_done_cb(struct rpc_task *task,
return -EAGAIN;
}
- pnfs_set_layoutcommit(data->inode, data->lseg, data->lwb);
+ if (!err)
+ pnfs_set_layoutcommit(data->inode, data->lseg, data->lwb);
- return 0;
+ return err;
}
static void filelayout_write_prepare(struct rpc_task *task, void *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
