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

Commit bc749ca4 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: eliminate ENCODE_HEAD macro 



This macro doesn't serve any useful purpose.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent e06b6405

fs/nfsd/nfs4xdr.c

+22 −24
Original line number Original line Diff line number Diff line
@@ -1503,8 +1503,6 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 
 * task to translate them into Linux-specific versions which are more

 * task to translate them into Linux-specific versions which are more

 * consistent with the style used in NFSv2/v3...

 * consistent with the style used in NFSv2/v3...

 */

 */

#define ENCODE_HEAD              __be32 *p



#define WRITE32(n)               *p++ = htonl(n)

#define WRITE32(n)               *p++ = htonl(n)

#define WRITE64(n)               do {				\

#define WRITE64(n)               do {				\

	*p++ = htonl((u32)((n) >> 32));				\

	*p++ = htonl((u32)((n) >> 32));				\
@@ -2334,7 +2332,7 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, 
static void

static void

nfsd4_encode_stateid(struct nfsd4_compoundres *resp, stateid_t *sid)

nfsd4_encode_stateid(struct nfsd4_compoundres *resp, stateid_t *sid)

{

{

	ENCODE_HEAD;

	__be32 *p;





	RESERVE_SPACE(sizeof(stateid_t));

	RESERVE_SPACE(sizeof(stateid_t));

	WRITE32(sid->si_generation);

	WRITE32(sid->si_generation);
@@ -2345,7 +2343,7 @@ nfsd4_encode_stateid(struct nfsd4_compoundres *resp, stateid_t *sid) 
static __be32

static __be32

nfsd4_encode_access(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_access *access)

nfsd4_encode_access(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_access *access)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(8);

		RESERVE_SPACE(8);
@@ -2372,7 +2370,7 @@ nfsd4_encode_close(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_c 
static __be32

static __be32

nfsd4_encode_commit(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_commit *commit)

nfsd4_encode_commit(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_commit *commit)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(8);

		RESERVE_SPACE(8);
@@ -2385,7 +2383,7 @@ nfsd4_encode_commit(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_ 
static __be32

static __be32

nfsd4_encode_create(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_create *create)

nfsd4_encode_create(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_create *create)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(32);

		RESERVE_SPACE(32);
@@ -2421,7 +2419,7 @@ nfsd4_encode_getfh(struct nfsd4_compoundres *resp, __be32 nfserr, struct svc_fh 
{

{

	struct svc_fh *fhp = *fhpp;

	struct svc_fh *fhp = *fhpp;

	unsigned int len;

	unsigned int len;

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		len = fhp->fh_handle.fh_size;

		len = fhp->fh_handle.fh_size;
@@ -2440,7 +2438,7 @@ nfsd4_encode_getfh(struct nfsd4_compoundres *resp, __be32 nfserr, struct svc_fh 
static void

static void

nfsd4_encode_lock_denied(struct nfsd4_compoundres *resp, struct nfsd4_lock_denied *ld)

nfsd4_encode_lock_denied(struct nfsd4_compoundres *resp, struct nfsd4_lock_denied *ld)

{

{

	ENCODE_HEAD;

	__be32 *p;





	RESERVE_SPACE(32 + XDR_LEN(ld->ld_sop ? ld->ld_sop->so_owner.len : 0));

	RESERVE_SPACE(32 + XDR_LEN(ld->ld_sop ? ld->ld_sop->so_owner.len : 0));

	WRITE64(ld->ld_start);

	WRITE64(ld->ld_start);
@@ -2496,7 +2494,7 @@ nfsd4_encode_locku(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_l 
static __be32

static __be32

nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_link *link)

nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_link *link)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(20);

		RESERVE_SPACE(20);
@@ -2510,7 +2508,7 @@ nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_li 
static __be32

static __be32

nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open)

nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open)

{

{

	ENCODE_HEAD;

	__be32 *p;

	ENCODE_SEQID_OP_HEAD;

	ENCODE_SEQID_OP_HEAD;





	if (nfserr)

	if (nfserr)
@@ -2605,7 +2603,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, 
	int v, pn;

	int v, pn;

	unsigned long maxcount; 

	unsigned long maxcount; 

	long len;

	long len;

	ENCODE_HEAD;

	__be32 *p;





	if (nfserr)

	if (nfserr)

		return nfserr;

		return nfserr;
@@ -2667,7 +2665,7 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd 
{

{

	int maxcount;

	int maxcount;

	char *page;

	char *page;

	ENCODE_HEAD;

	__be32 *p;





	if (nfserr)

	if (nfserr)

		return nfserr;

		return nfserr;
@@ -2716,7 +2714,7 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4 
	int maxcount;

	int maxcount;

	loff_t offset;

	loff_t offset;

	__be32 *page, *savep, *tailbase;

	__be32 *page, *savep, *tailbase;

	ENCODE_HEAD;

	__be32 *p;





	if (nfserr)

	if (nfserr)

		return nfserr;

		return nfserr;
@@ -2792,7 +2790,7 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4 
static __be32

static __be32

nfsd4_encode_remove(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_remove *remove)

nfsd4_encode_remove(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_remove *remove)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(20);

		RESERVE_SPACE(20);
@@ -2805,7 +2803,7 @@ nfsd4_encode_remove(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_ 
static __be32

static __be32

nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_rename *rename)

nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_rename *rename)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(40);

		RESERVE_SPACE(40);
@@ -2825,7 +2823,7 @@ nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, __be32 nfserr, 
	u32 nflavs;

	u32 nflavs;

	struct exp_flavor_info *flavs;

	struct exp_flavor_info *flavs;

	struct exp_flavor_info def_flavs[2];

	struct exp_flavor_info def_flavs[2];

	ENCODE_HEAD;

	__be32 *p;





	if (nfserr)

	if (nfserr)

		goto out;

		goto out;
@@ -2890,7 +2888,7 @@ nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, __be32 nfserr, 
static __be32

static __be32

nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_setattr *setattr)

nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_setattr *setattr)

{

{

	ENCODE_HEAD;

	__be32 *p;





	RESERVE_SPACE(12);

	RESERVE_SPACE(12);

	if (nfserr) {

	if (nfserr) {
@@ -2910,7 +2908,7 @@ nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4 
static __be32

static __be32

nfsd4_encode_setclientid(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_setclientid *scd)

nfsd4_encode_setclientid(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_setclientid *scd)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(8 + sizeof(nfs4_verifier));

		RESERVE_SPACE(8 + sizeof(nfs4_verifier));
@@ -2930,7 +2928,7 @@ nfsd4_encode_setclientid(struct nfsd4_compoundres *resp, __be32 nfserr, struct n 
static __be32

static __be32

nfsd4_encode_write(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_write *write)

nfsd4_encode_write(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_write *write)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (!nfserr) {

	if (!nfserr) {

		RESERVE_SPACE(16);

		RESERVE_SPACE(16);
@@ -2946,7 +2944,7 @@ static __be32 
nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, int nfserr,

nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, int nfserr,

			 struct nfsd4_exchange_id *exid)

			 struct nfsd4_exchange_id *exid)

{

{

	ENCODE_HEAD;

	__be32 *p;

	char *major_id;

	char *major_id;

	char *server_scope;

	char *server_scope;

	int major_id_sz;

	int major_id_sz;
@@ -3001,7 +2999,7 @@ static __be32 
nfsd4_encode_create_session(struct nfsd4_compoundres *resp, int nfserr,

nfsd4_encode_create_session(struct nfsd4_compoundres *resp, int nfserr,

			    struct nfsd4_create_session *sess)

			    struct nfsd4_create_session *sess)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (nfserr)

	if (nfserr)

		return nfserr;

		return nfserr;
@@ -3057,7 +3055,7 @@ __be32 
nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr,

nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr,

		      struct nfsd4_sequence *seq)

		      struct nfsd4_sequence *seq)

{

{

	ENCODE_HEAD;

	__be32 *p;





	if (nfserr)

	if (nfserr)

		return nfserr;

		return nfserr;
@@ -3205,7 +3203,7 @@ void 
nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)

nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op)

{

{

	__be32 *statp;

	__be32 *statp;

	ENCODE_HEAD;

	__be32 *p;





	RESERVE_SPACE(8);

	RESERVE_SPACE(8);

	WRITE32(op->opnum);

	WRITE32(op->opnum);
@@ -3239,7 +3237,7 @@ nfsd4_encode_operation(struct nfsd4_compoundres *resp, struct nfsd4_op *op) 
void

void

nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op)

nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op)

{

{

	ENCODE_HEAD;

	__be32 *p;

	struct nfs4_replay *rp = op->replay;

	struct nfs4_replay *rp = op->replay;





	BUG_ON(!rp);

	BUG_ON(!rp);