From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
---
fs/nfsd/nfs4callback.c | 4 ++--
include/linux/nfsd/state.h | 1 +
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 */
--
1.6.0.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
