aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2012-10-03 02:39:34 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-03 20:10:28 -0400
commit5f65753033d8c5a53e65810bff3832e8282c68d1 (patch)
tree97df48c9fe25a460c0953101eccf9f2e7ed22693 /fs/nfs
parent8544a9dc18a1aa787b85425ecc9233b0a9adaff4 (diff)
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 2b62e3f79c91..68b21d81b7ac 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -840,6 +840,7 @@ static void nfs4_init_opendata_res(struct nfs4_opendata *p)
840 p->o_res.seqid = p->o_arg.seqid; 840 p->o_res.seqid = p->o_arg.seqid;
841 p->c_res.seqid = p->c_arg.seqid; 841 p->c_res.seqid = p->c_arg.seqid;
842 p->o_res.server = p->o_arg.server; 842 p->o_res.server = p->o_arg.server;
843 p->o_res.access_request = p->o_arg.access;
843 nfs_fattr_init(&p->f_attr); 844 nfs_fattr_init(&p->f_attr);
844 nfs_fattr_init_names(&p->f_attr, &p->owner_name, &p->group_name); 845 nfs_fattr_init_names(&p->f_attr, &p->owner_name, &p->group_name);
845} 846}
@@ -875,7 +876,6 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
875 * are cached */ 876 * are cached */
876 p->o_arg.access = NFS4_ACCESS_READ | NFS4_ACCESS_MODIFY | 877 p->o_arg.access = NFS4_ACCESS_READ | NFS4_ACCESS_MODIFY |
877 NFS4_ACCESS_EXTEND | NFS4_ACCESS_EXECUTE; 878 NFS4_ACCESS_EXTEND | NFS4_ACCESS_EXECUTE;
878 p->o_res.access_request = p->o_arg.access;
879 } 879 }
880 p->o_arg.clientid = server->nfs_client->cl_clientid; 880 p->o_arg.clientid = server->nfs_client->cl_clientid;
881 p->o_arg.id.create_time = ktime_to_ns(sp->so_seqid.create_time); 881 p->o_arg.id.create_time = ktime_to_ns(sp->so_seqid.create_time);