Skip to contentSkip to conversation

SQUASHME pnfs: restore state recovery in async handler

PATCH In review [email protected] 2 participants 2 messages May 4, 2010 – May 6, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SQUASHME pnfs: restore state recovery in async handler

From: Andy Adamson <[email protected]>

For some reason, the call to nfs4_schedule_state_recovery was removed from the pNFS git trees, but is present in the straight 2.6.34-rcX kernels.

---
 fs/nfs/nfs4proc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
fs/nfs/nfs4proc.c +1 -0
index 4b3bd81..43dab3c 100644
@@ -3694,6 +3694,7 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
 			dprintk("%s ERROR %d, Reset session. Exchangeid "
 				"flags 0x%x\n", __func__, task->tk_status,
 				clp->cl_exchange_flags);
+			nfs4_schedule_state_recovery(clp);
 			task->tk_status = 0;
 			return -EAGAIN;
 #endif /* CONFIG_NFS_V4_1 */
Signature · 1 line
1.6.6
#1 lore raw
Quoted 4 lines · On May. 05, 2010, 0:54 +0300, [email protected] wrote:

From: Andy Adamson <[email protected]>

For some reason, the call to nfs4_schedule_state_recovery was removed from the pNFS git trees, but is present in the straight 2.6.34-rcX kernels.

Committed to pnfs-submit. Thanks!

Benny

Quoted 18 lines
---
 fs/nfs/nfs4proc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
fs/nfs/nfs4proc.c +1 -0
index 4b3bd81..43dab3c 100644
@@ -3694,6 +3694,7 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
 			dprintk("%s ERROR %d, Reset session. Exchangeid "
 				"flags 0x%x\n", __func__, task->tk_status,
 				clp->cl_exchange_flags);
+			nfs4_schedule_state_recovery(clp);
 			task->tk_status = 0;
 			return -EAGAIN;
 #endif /* CONFIG_NFS_V4_1 */