diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /fs/lockd/mon.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'fs/lockd/mon.c')
| -rw-r--r-- | fs/lockd/mon.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 795425201..dee4f28e7 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -195,6 +195,12 @@ xdr_decode_stat(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp) #define SM_my_id_sz (3+1+SM_my_name_sz) #define SM_mon_id_sz (1+XDR_QUADLEN(20)+SM_my_id_sz) #define SM_mon_sz (SM_mon_id_sz+4) +#define SM_monres_sz 2 +#define SM_unmonres_sz 1 + +#ifndef MAX +# define MAX(a, b) (((a) > (b))? (a) : (b)) +#endif static struct rpc_procinfo nsm_procedures[] = { { "sm_null", @@ -205,10 +211,10 @@ static struct rpc_procinfo nsm_procedures[] = { (kxdrproc_t) xdr_error, 0, 0 }, { "sm_mon", (kxdrproc_t) xdr_encode_mon, - (kxdrproc_t) xdr_decode_stat_res, SM_mon_sz, 2 }, + (kxdrproc_t) xdr_decode_stat_res, MAX(SM_mon_sz, SM_monres_sz) << 2, 0 }, { "sm_unmon", (kxdrproc_t) xdr_encode_mon, - (kxdrproc_t) xdr_decode_stat, SM_mon_id_sz, 1 }, + (kxdrproc_t) xdr_decode_stat, MAX(SM_mon_id_sz, SM_unmonres_sz) << 2, 0 }, { "sm_unmon_all", (kxdrproc_t) xdr_error, (kxdrproc_t) xdr_error, 0, 0 }, |