aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd/xdr4.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/lockd/xdr4.c')
-rw-r--r--fs/lockd/xdr4.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index 7c8b679c394c..ce1efdbe1b3a 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -544,10 +544,6 @@ nlm4clt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
544#define NLM4_res_sz NLM4_cookie_sz+1 544#define NLM4_res_sz NLM4_cookie_sz+1
545#define NLM4_norep_sz 0 545#define NLM4_norep_sz 0
546 546
547#ifndef MAX
548# define MAX(a,b) (((a) > (b))? (a) : (b))
549#endif
550
551/* 547/*
552 * For NLM, a void procedure really returns nothing 548 * For NLM, a void procedure really returns nothing
553 */ 549 */
@@ -558,7 +554,8 @@ nlm4clt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp)
558 .p_proc = NLMPROC_##proc, \ 554 .p_proc = NLMPROC_##proc, \
559 .p_encode = (kxdrproc_t) nlm4clt_encode_##argtype, \ 555 .p_encode = (kxdrproc_t) nlm4clt_encode_##argtype, \
560 .p_decode = (kxdrproc_t) nlm4clt_decode_##restype, \ 556 .p_decode = (kxdrproc_t) nlm4clt_decode_##restype, \
561 .p_bufsiz = MAX(NLM4_##argtype##_sz, NLM4_##restype##_sz) << 2, \ 557 .p_arglen = NLM4_##argtype##_sz, \
558 .p_replen = NLM4_##restype##_sz, \
562 .p_statidx = NLMPROC_##proc, \ 559 .p_statidx = NLMPROC_##proc, \
563 .p_name = #proc, \ 560 .p_name = #proc, \
564 } 561 }