summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-03-18 14:11:24 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-03-19 08:34:20 -0400
commitf9b7ebdf7e41671de7926a5951c324258200b42a (patch)
tree087fa9469a8c8d283ba46eb8cc8da1660e08ee06
parent706cb8db3b629f6021499a5edfdde526a3cf7d95 (diff)
downloadblackbird-op-linux-f9b7ebdf7e41671de7926a5951c324258200b42a.tar.gz
blackbird-op-linux-f9b7ebdf7e41671de7926a5951c324258200b42a.zip
NFSv4: Schedule recovery if nfs40_walk_client_list() is interrupted
If a timeout or a signal interrupts the NFSv4 trunking discovery SETCLIENTID_CONFIRM call, then we don't know whether or not the server has changed the callback identifier on us. Assume that it did, and schedule a 'path down' recovery... Tested-by: Steve Dickson <steved@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/nfs4client.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 0e46d3d1b6cc..aa9ef4876046 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -531,6 +531,13 @@ int nfs40_walk_client_list(struct nfs_client *new,
*result = pos;
dprintk("NFS: <-- %s using nfs_client = %p ({%d})\n",
__func__, pos, atomic_read(&pos->cl_count));
+ goto out;
+ case -ERESTARTSYS:
+ case -ETIMEDOUT:
+ /* The callback path may have been inadvertently
+ * changed. Schedule recovery!
+ */
+ nfs4_schedule_path_down_recovery(pos);
default:
goto out;
}
OpenPOWER on IntegriCloud