Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 578e4585 authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust
Browse files

nfs41: Move initialization of nfs4_opendata seq_res to nfs4_init_opendata_res 



nfs4_open_recover_helper clears opendata->o_res
before calling nfs4_init_opendata_res, thus causing
NFSv4.0 OPEN operations to be sent rather than nfsv4.1.

Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1f84603c

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ static void nfs4_init_opendata_res(struct nfs4_opendata *p) 
	p->o_res.server = p->o_arg.server;

	nfs_fattr_init(&p->f_attr);

	nfs_fattr_init(&p->dir_attr);

	p->o_res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

}



static struct nfs4_opendata *nfs4_opendata_alloc(struct path *path,
@@ -711,7 +712,6 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct path *path, 
	p->o_arg.server = server;

	p->o_arg.bitmask = server->attr_bitmask;

	p->o_arg.claim = NFS4_OPEN_CLAIM_NULL;

	p->o_res.seq_res.sr_slotid = NFS4_MAX_SLOT_TABLE;

	if (flags & O_EXCL) {

		u32 *s = (u32 *) p->o_arg.u.verifier.data;

		s[0] = jiffies;