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

Commit 62cd4a59 authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan Committed by J. Bruce Fields
Browse files

nfsd41: handle current stateid on lock and locku 



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

fs/nfsd/current_stateid.h

+10 −1
Original line number Diff line number Diff line
@@ -4,8 +4,17 @@ 
#include "state.h"

#include "xdr4.h"



/*

 * functions to set current state id

 */

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

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

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

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



/*

 * functions to consume current state id

 */

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

extern void nfsd4_get_lockustateid(struct nfsd4_compound_state *, struct nfsd4_locku *);



#endif   /* _NFSD4_CURRENT_STATE_H */

fs/nfsd/nfs4proc.c

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

		.op_name = "OP_LOCK",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_lock_rsize,

		.op_set_currentstateid = (stateid_setter)nfsd4_set_lockstateid,

	},

	[OP_LOCKT] = {

		.op_func = (nfsd4op_func)nfsd4_lockt,
@@ -1484,6 +1485,7 @@ static struct nfsd4_operation nfsd4_ops[] = { 
		.op_flags = OP_MODIFIES_SOMETHING,

		.op_name = "OP_LOCKU",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_status_stateid_rsize,

		.op_get_currentstateid = (stateid_getter)nfsd4_get_lockustateid,

	},

	[OP_LOOKUP] = {

		.op_func = (nfsd4op_func)nfsd4_lookup,

fs/nfsd/nfs4state.c

+20 −2
Original line number Diff line number Diff line
@@ -4710,12 +4710,30 @@ put_stateid(struct nfsd4_compound_state *cstate, stateid_t *stateid) 
		cstate->current_stateid = stateid;

}



/*

 * functions to set current state id

 */

void

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

{

	put_stateid(cstate, &open->op_stateid);

}



void

nfsd4_set_closestateid(struct nfsd4_compound_state *cstate, struct nfsd4_close *close)

{

	put_stateid(cstate, &close->cl_stateid);

}



void

nfsd4_set_lockstateid(struct nfsd4_compound_state *cstate, struct nfsd4_lock *lock)

{

	put_stateid(cstate, &lock->lk_resp_stateid);

}



/*

 * functions to consume current state id

 */

void

nfsd4_get_closestateid(struct nfsd4_compound_state *cstate, struct nfsd4_close *close)

{
@@ -4723,7 +4741,7 @@ nfsd4_get_closestateid(struct nfsd4_compound_state *cstate, struct nfsd4_close * 
}



void

nfsd4_set_closestateid(struct nfsd4_compound_state *cstate, struct nfsd4_close *close)

nfsd4_get_lockustateid(struct nfsd4_compound_state *cstate, struct nfsd4_locku *locku)

{

	get_stateid(cstate, &close->cl_stateid);

	get_stateid(cstate, &locku->lu_stateid);

}