diff options
-rw-r--r-- | fs/nfsd/nfs4callback.c | 4 | ||||
-rw-r--r-- | 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 0420b5e6e20d..b88b207d75d9 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
@@ -507,11 +507,11 @@ nfsd4_cb_recall(struct nfs4_delegation *dp) | |||
507 | .rpc_argp = dp, | 507 | .rpc_argp = dp, |
508 | .rpc_cred = clp->cl_cb_conn.cb_cred | 508 | .rpc_cred = clp->cl_cb_conn.cb_cred |
509 | }; | 509 | }; |
510 | int retries = 1; | ||
511 | int status = 0; | 510 | int status = 0; |
512 | 511 | ||
512 | dp->dl_retries = 1; | ||
513 | status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFT); | 513 | status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFT); |
514 | while (retries--) { | 514 | while (dp->dl_retries--) { |
515 | switch (status) { | 515 | switch (status) { |
516 | case -EIO: | 516 | case -EIO: |
517 | /* Network partition? */ | 517 | /* Network partition? */ |
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h index 346b603072ce..c0c49215ddc5 100644 --- a/include/linux/nfsd/state.h +++ b/include/linux/nfsd/state.h | |||
@@ -76,6 +76,7 @@ struct nfs4_delegation { | |||
76 | u32 dl_ident; | 76 | u32 dl_ident; |
77 | stateid_t dl_stateid; | 77 | stateid_t dl_stateid; |
78 | struct knfsd_fh dl_fh; | 78 | struct knfsd_fh dl_fh; |
79 | int dl_retries; | ||
79 | }; | 80 | }; |
80 | 81 | ||
81 | /* client delegation callback info */ | 82 | /* client delegation callback info */ |