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

Commit 30813e27 authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan Committed by J. Bruce Fields
Browse files

nfsd41: consume current stateid on read and write 



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

fs/nfsd/current_stateid.h

+2 −0
Original line number Diff line number Diff line
@@ -16,5 +16,7 @@ extern void nfsd4_set_closestateid(struct nfsd4_compound_state *, struct nfsd4_c 
 */

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

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

extern void nfsd4_get_readstateid(struct nfsd4_compound_state *, struct nfsd4_read *);

extern void nfsd4_get_writestateid(struct nfsd4_compound_state *, struct nfsd4_write *);



#endif   /* _NFSD4_CURRENT_STATE_H */

fs/nfsd/nfs4proc.c

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

		.op_name = "OP_READ",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_read_rsize,

		.op_get_currentstateid = (stateid_getter)nfsd4_get_readstateid,

	},

	[OP_READDIR] = {

		.op_func = (nfsd4op_func)nfsd4_readdir,
@@ -1624,6 +1625,7 @@ static struct nfsd4_operation nfsd4_ops[] = { 
		.op_flags = OP_MODIFIES_SOMETHING | OP_CACHEME,

		.op_name = "OP_WRITE",

		.op_rsize_bop = (nfsd4op_rsize)nfsd4_write_rsize,

		.op_get_currentstateid = (stateid_getter)nfsd4_get_writestateid,

	},

	[OP_RELEASE_LOCKOWNER] = {

		.op_func = (nfsd4op_func)nfsd4_release_lockowner,

fs/nfsd/nfs4state.c

+12 −0
Original line number Diff line number Diff line
@@ -4745,3 +4745,15 @@ nfsd4_get_lockustateid(struct nfsd4_compound_state *cstate, struct nfsd4_locku * 
{

	get_stateid(cstate, &locku->lu_stateid);

}



void

nfsd4_get_readstateid(struct nfsd4_compound_state *cstate, struct nfsd4_read *read)

{

	get_stateid(cstate, &read->rd_stateid);

}



void

nfsd4_get_writestateid(struct nfsd4_compound_state *cstate, struct nfsd4_write *write)

{

	get_stateid(cstate, &write->wr_stateid);

}