summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-05-01 20:11:12 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-05-01 20:11:12 -0400
commit3aea09dc9106407d8bc18e593fbffda9ad632844 (patch)
tree563b9b3cfbd5203e87b7fea59946729c135de1d3
parent6707bd3d420f53ae8f090dac871843f6f43c9980 (diff)
downloadop-kernel-dev-3aea09dc9106407d8bc18e593fbffda9ad632844.zip
op-kernel-dev-3aea09dc9106407d8bc18e593fbffda9ad632844.tar.gz
nfsd4: track recall retries in nfs4_delegation
Move this out of a local variable into the nfs4_delegation object in preparation for making this an async rpc call (at which point we'll need any state like this in a common object that's preserved across function calls). Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/nfsd/nfs4callback.c4
-rw-r--r--include/linux/nfsd/state.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 0420b5e..b88b207 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -507,11 +507,11 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
.rpc_argp = dp,
.rpc_cred = clp->cl_cb_conn.cb_cred
};
- int retries = 1;
int status = 0;
+ dp->dl_retries = 1;
status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFT);
- while (retries--) {
+ while (dp->dl_retries--) {
switch (status) {
case -EIO:
/* Network partition? */
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 346b603..c0c4921 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -76,6 +76,7 @@ struct nfs4_delegation {
u32 dl_ident;
stateid_t dl_stateid;
struct knfsd_fh dl_fh;
+ int dl_retries;
};
/* client delegation callback info */
OpenPOWER on IntegriCloud