| .. | .. |
|---|
| 875 | 875 | if (!kcred) |
|---|
| 876 | 876 | return NULL; |
|---|
| 877 | 877 | |
|---|
| 878 | | - kcred->uid = ses->se_cb_sec.uid; |
|---|
| 879 | | - kcred->gid = ses->se_cb_sec.gid; |
|---|
| 878 | + kcred->fsuid = ses->se_cb_sec.uid; |
|---|
| 879 | + kcred->fsgid = ses->se_cb_sec.gid; |
|---|
| 880 | 880 | return kcred; |
|---|
| 881 | 881 | } |
|---|
| 882 | 882 | } |
|---|
| .. | .. |
|---|
| 915 | 915 | args.authflavor = clp->cl_cred.cr_flavor; |
|---|
| 916 | 916 | clp->cl_cb_ident = conn->cb_ident; |
|---|
| 917 | 917 | } else { |
|---|
| 918 | | - if (!conn->cb_xprt) { |
|---|
| 919 | | - trace_nfsd_cb_setup_err(clp, -EINVAL); |
|---|
| 918 | + if (!conn->cb_xprt) |
|---|
| 920 | 919 | return -EINVAL; |
|---|
| 921 | | - } |
|---|
| 922 | | - clp->cl_cb_conn.cb_xprt = conn->cb_xprt; |
|---|
| 923 | 920 | clp->cl_cb_session = ses; |
|---|
| 924 | 921 | args.bc_xprt = conn->cb_xprt; |
|---|
| 925 | 922 | args.prognumber = clp->cl_cb_session->se_cb_prog; |
|---|
| .. | .. |
|---|
| 939 | 936 | rpc_shutdown_client(client); |
|---|
| 940 | 937 | return -ENOMEM; |
|---|
| 941 | 938 | } |
|---|
| 939 | + |
|---|
| 940 | + if (clp->cl_minorversion != 0) |
|---|
| 941 | + clp->cl_cb_conn.cb_xprt = conn->cb_xprt; |
|---|
| 942 | 942 | clp->cl_cb_client = client; |
|---|
| 943 | 943 | clp->cl_cb_cred = cred; |
|---|
| 944 | 944 | trace_nfsd_cb_setup(clp); |
|---|