Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 51581f3bf922512880f52a7777923fd6dcfc792b

Authored by Trond Myklebust
1 parent 3e4f6290ca
Exists in master and in 7 other branches 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, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

NFSv4: SETCLIENTID_CONFIRM should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE 

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 2 changed files with 20 additions and 2 deletions Side-by-side Diff

... ... @@ -2849,8 +2849,7 @@
2849 2849 return status;
2850 2850 }
2851 2851  
2852   -int
2853   -nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred)
  2852 +static int _nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred)
2854 2853 {
2855 2854 struct nfs_fsinfo fsinfo;
2856 2855 struct rpc_message msg = {
... ... @@ -2872,6 +2871,24 @@
2872 2871 spin_unlock(&clp->cl_lock);
2873 2872 }
2874 2873 return status;
  2874 +}
  2875 +
  2876 +int nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred)
  2877 +{
  2878 + long timeout;
  2879 + int err;
  2880 + do {
  2881 + err = _nfs4_proc_setclientid_confirm(clp, cred);
  2882 + switch (err) {
  2883 + case 0:
  2884 + return err;
  2885 + case -NFS4ERR_RESOURCE:
  2886 + /* The IBM lawyers misread another document! */
  2887 + case -NFS4ERR_DELAY:
  2888 + err = nfs4_delay(clp->cl_rpcclient, &timeout);
  2889 + }
  2890 + } while (err == 0);
  2891 + return err;
2875 2892 }
2876 2893  
2877 2894 struct nfs4_delegreturndata {
... ... @@ -977,6 +977,7 @@
977 977 out_error:
978 978 printk(KERN_WARNING "Error: state recovery failed on NFSv4 server %u.%u.%u.%u with error %d\n",
979 979 NIPQUAD(clp->cl_addr.s_addr), -status);
  980 + set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
980 981 goto out;
981 982 }
982 983