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

Commit 9428fe1a authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan Committed by J. Bruce Fields
Browse files

nfsd41: consume current stateid on DELEGRETURN and OPENDOWNGRADE 



Signed-off-by: default avatarTigran Mkrtchyan <kofemann@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 1e97b519

fs/nfsd/current_stateid.h

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
/*

 * functions to set current state id

 */

extern void nfsd4_set_opendowngradestateid(struct nfsd4_compound_state *cstate, struct nfsd4_open_downgrade *);

extern void nfsd4_set_openstateid(struct nfsd4_compound_state *, struct nfsd4_open *);

extern void nfsd4_set_lockstateid(struct nfsd4_compound_state *, struct nfsd4_lock *);

extern void nfsd4_set_closestateid(struct nfsd4_compound_state *, struct nfsd4_close *);
@@ -14,6 +15,8 @@ extern void nfsd4_set_closestateid(struct nfsd4_compound_state *, struct nfsd4_c 
/*

 * functions to consume current state id

 */

extern void nfsd4_get_opendowngradestateid(struct nfsd4_compound_state *cstate, struct nfsd4_open_downgrade *);

extern void nfsd4_get_delegreturnstateid(struct nfsd4_compound_state *, struct nfsd4_delegreturn *);

extern void nfsd4_get_freestateid(struct nfsd4_compound_state *, struct nfsd4_free_stateid *);

extern void nfsd4_get_setattrstateid(struct nfsd4_compound_state *, struct nfsd4_setattr *);

extern void nfsd4_get_closestateid(struct nfsd4_compound_state *, struct nfsd4_close *);

fs/nfsd/nfs4proc.c

+3 −0
Original line number Diff line number Diff line
@@ -1454,6 +1454,7 @@ static struct nfsd4_operation nfsd4_ops[] = { 
		.op_flags = OP_MODIFIES_SOMETHING,

		.op_name = "OP_DELEGRETURN",

		.op_rsize_bop = nfsd4_only_status_rsize,

		.op_get_currentstateid = (stateid_getter)nfsd4_get_delegreturnstateid,

	},

	[OP_GETATTR] = {

		.op_func = (nfsd4op_func)nfsd4_getattr,
@@ -1521,6 +1522,8 @@ static struct nfsd4_operation nfsd4_ops[] = { 
		.op_flags = OP_MODIFIES_SOMETHING,

		.op_name = "OP_OPEN_DOWNGRADE",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_status_stateid_rsize,

		.op_get_currentstateid = (stateid_getter)nfsd4_get_opendowngradestateid,

		.op_set_currentstateid = (stateid_setter)nfsd4_set_opendowngradestateid,

	},

	[OP_PUTFH] = {

		.op_func = (nfsd4op_func)nfsd4_putfh,

fs/nfsd/nfs4state.c

+18 −0
Original line number Diff line number Diff line
@@ -4713,6 +4713,12 @@ put_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid) 
/*

 * functions to set current state id

 */

void

nfsd4_set_opendowngradestateid(struct nfsd4_compound_state *cstate, struct nfsd4_open_downgrade *odp)

{

	put_stateid(cstate, &odp->od_stateid);

}



void

nfsd4_set_openstateid(struct nfsd4_compound_state *cstate, struct nfsd4_open *open)

{
@@ -4735,6 +4741,18 @@ nfsd4_set_lockstateid(struct nfsd4_compound_state *cstate, struct nfsd4_lock *lo 
 * functions to consume current state id

 */



void

nfsd4_get_opendowngradestateid(struct nfsd4_compound_state *cstate, struct nfsd4_open_downgrade *odp)

{

	get_stateid(cstate, &odp->od_stateid);

}



void

nfsd4_get_delegreturnstateid(struct nfsd4_compound_state *cstate, struct nfsd4_delegreturn *drp)

{

	get_stateid(cstate, &drp->dr_stateid);

}



void

nfsd4_get_freestateid(struct nfsd4_compound_state *cstate, struct nfsd4_free_stateid *fsp)

{