From: Andy Adamson <andros@xxxxxxxxxx>
The DS has a connection error (invalid deviceid). Drain the fore channel
slot table waitq.
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/nfs4filelayout.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index faba987..ce8734d 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -120,6 +120,7 @@ static int filelayout_async_handle_error(struct rpc_task *task,
{
struct nfs_server *mds_server = NFS_SERVER(state->inode);
struct nfs_client *mds_client = mds_server->nfs_client;
+ struct nfs4_slot_table *tbl = &clp->cl_session->fc_slot_table;
if (task->tk_status >= 0)
return 0;
@@ -168,6 +169,7 @@ static int filelayout_async_handle_error(struct rpc_task *task,
dprintk("%s DS connection error %d\n", __func__,
task->tk_status);
filelayout_mark_devid_invalid(devid);
+ rpc_wake_up(&tbl->slot_tbl_waitq);
/* fall through */
default:
dprintk("%s Retry through MDS. Error %d\n", __func__,
@@ -192,8 +194,6 @@ static int filelayout_read_done_cb(struct rpc_task *task,
struct nfs4_deviceid_node *devid = FILELAYOUT_DEVID_NODE(data->lseg);
int err;
- dprintk("%s DS read\n", __func__);
-
err = filelayout_async_handle_error(task, data->args.context->state,
data->ds_clp, devid);
--
1.7.6.4
--
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
