Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5f65753033d8c5a53e65810bff3832e8282c68d1

Authored by Andy Adamson
Committed by Trond Myklebust
1 parent 8544a9dc18
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches 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

NFSv4 set open access operation call flag in nfs4_init_opendata_res 

nfs4_open_recover_helper zeros the nfs4_opendata result structures, removing
the result access_request information which leads to an XDR decode error.

Move the setting of the result access_request field to nfs4_init_opendata_res
which sets all the other required nfs4_opendata result fields and is shared
between the open and recover open paths.

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

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -840,6 +840,7 @@
840 840 p->o_res.seqid = p->o_arg.seqid;
841 841 p->c_res.seqid = p->c_arg.seqid;
842 842 p->o_res.server = p->o_arg.server;
  843 + p->o_res.access_request = p->o_arg.access;
843 844 nfs_fattr_init(&p->f_attr);
844 845 nfs_fattr_init_names(&p->f_attr, &p->owner_name, &p->group_name);
845 846 }
... ... @@ -875,7 +876,6 @@
875 876 * are cached */
876 877 p->o_arg.access = NFS4_ACCESS_READ | NFS4_ACCESS_MODIFY |
877 878 NFS4_ACCESS_EXTEND | NFS4_ACCESS_EXECUTE;
878   - p->o_res.access_request = p->o_arg.access;
879 879 }
880 880 p->o_arg.clientid = server->nfs_client->cl_clientid;
881 881 p->o_arg.id.create_time = ktime_to_ns(sp->so_seqid.create_time);