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

Commit 43212cc7 authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields
Browse files

nfsd: using nfsd4_encode_noop for encoding destroy_session/free_stateid 



Get rid of the extra code, using nfsd4_encode_noop for encoding destroy_session and free_stateid.
And, delete unused argument (fr_status) int nfsd4_free_stateid.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent a9f7b4a0

fs/nfsd/nfs4xdr.c

+2 −24
Original line number Diff line number Diff line
@@ -3500,28 +3500,6 @@ nfsd4_encode_create_session(struct nfsd4_compoundres *resp, __be32 nfserr, 
	return 0;

}



static __be32

nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, __be32 nfserr,

			     struct nfsd4_destroy_session *destroy_session)

{

	return nfserr;

}



static __be32

nfsd4_encode_free_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,

			  struct nfsd4_free_stateid *free_stateid)

{

	__be32 *p;



	if (nfserr)

		return nfserr;



	RESERVE_SPACE(4);

	*p++ = nfserr;

	ADJUST_ARGS();

	return nfserr;

}



static __be32

nfsd4_encode_sequence(struct nfsd4_compoundres *resp, __be32 nfserr,

		      struct nfsd4_sequence *seq)
@@ -3620,8 +3598,8 @@ static nfsd4_enc nfsd4_enc_ops[] = { 
	[OP_BIND_CONN_TO_SESSION] = (nfsd4_enc)nfsd4_encode_bind_conn_to_session,

	[OP_EXCHANGE_ID]	= (nfsd4_enc)nfsd4_encode_exchange_id,

	[OP_CREATE_SESSION]	= (nfsd4_enc)nfsd4_encode_create_session,

	[OP_DESTROY_SESSION]	= (nfsd4_enc)nfsd4_encode_destroy_session,

	[OP_FREE_STATEID]	= (nfsd4_enc)nfsd4_encode_free_stateid,

	[OP_DESTROY_SESSION]	= (nfsd4_enc)nfsd4_encode_noop,

	[OP_FREE_STATEID]	= (nfsd4_enc)nfsd4_encode_noop,

	[OP_GET_DIR_DELEGATION]	= (nfsd4_enc)nfsd4_encode_noop,

	[OP_GETDEVICEINFO]	= (nfsd4_enc)nfsd4_encode_noop,

	[OP_GETDEVICELIST]	= (nfsd4_enc)nfsd4_encode_noop,

fs/nfsd/xdr4.h

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ struct nfsd4_test_stateid { 


struct nfsd4_free_stateid {

	stateid_t	fr_stateid;         /* request */

	__be32		fr_status;          /* response */

};



/* also used for NVERIFY */