Commit
3aea09dc9106407d8bc18e593fbffda9ad632844
Exists in
master
and in
39 other branches
8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y
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>
Showing
2 changed files
with
3 additions
and
2 deletions
Side-by-side Diff
... |
... |
@@ -507,11 +507,11 @@ |
507
|
507 |
.rpc_argp = dp, |
508
|
508 |
.rpc_cred = clp->cl_cb_conn.cb_cred |
509
|
509 |
}; |
510
|
|
- int retries = 1; |
511
|
510 |
int status = 0; |
512
|
511 |
|
|
512 |
+ dp->dl_retries = 1; |
513
|
513 |
status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFT); |
514
|
|
- while (retries--) { |
|
514 |
+ while (dp->dl_retries--) { |
515
|
515 |
switch (status) { |
516
|
516 |
case -EIO: |
517
|
517 |
/* Network partition? */ |
... |
... |
@@ -76,6 +76,7 @@ |
76
|
76 |
u32 dl_ident; |
77
|
77 |
stateid_t dl_stateid; |
78
|
78 |
struct knfsd_fh dl_fh; |
|
79 |
+ int dl_retries; |
79
|
80 |
}; |
80
|
81 |
|
81
|
82 |
/* client delegation callback info */ |