diff options
author | kris <kris@FreeBSD.org> | 2008-08-18 12:11:47 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2008-08-18 12:11:47 +0000 |
commit | 14af2b99b47a416b25da57e4943add3ffba2ffcf (patch) | |
tree | b0165f97c1fbcddc013e0445385d0a5c9d7ae350 /sys/rpc | |
parent | f2e31d98755fea3de9746534558826861d279d05 (diff) | |
download | FreeBSD-src-14af2b99b47a416b25da57e4943add3ffba2ffcf.zip FreeBSD-src-14af2b99b47a416b25da57e4943add3ffba2ffcf.tar.gz |
Rename the static M_RPC defined here to M_RPCCLNT, since a global M_RPC
now optionally exists.
Reviewed by: dfr
MFC after: 3 days
Diffstat (limited to 'sys/rpc')
-rw-r--r-- | sys/rpc/rpcclnt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/rpc/rpcclnt.c b/sys/rpc/rpcclnt.c index 01f8cd0..54cde66 100644 --- a/sys/rpc/rpcclnt.c +++ b/sys/rpc/rpcclnt.c @@ -101,7 +101,7 @@ struct pool rpcclnt_pool; #define RPCTASKPOOL_LWM 10 #define RPCTASKPOOL_HWM 40 #else -static MALLOC_DEFINE(M_RPC, "rpcclnt", "rpc state"); +static MALLOC_DEFINE(M_RPCCLNT, "rpcclnt", "rpc state"); #endif #define RPC_RETURN(X) do { RPCDEBUG("returning %d", X); return X; }while(0) @@ -1154,7 +1154,7 @@ rpcclnt_request(rpc, mrest, procnum, td, cred, reply) #ifdef __OpenBSD__ task = pool_get(&rpctask_pool, PR_WAITOK); #else - MALLOC(task, struct rpctask *, sizeof(struct rpctask), M_RPC, (M_WAITOK | M_ZERO)); + MALLOC(task, struct rpctask *, sizeof(struct rpctask), M_RPCCLNT, (M_WAITOK | M_ZERO)); #endif task->r_rpcclnt = rpc; @@ -1172,7 +1172,7 @@ rpcclnt_request(rpc, mrest, procnum, td, cred, reply) #ifdef __OpenBSD__ pool_put(&rpctask_pool, task); #else - FREE(task, M_RPC); + FREE(task, M_RPCCLNT); #endif error = EPROTONOSUPPORT; goto rpcmout; @@ -1294,7 +1294,7 @@ rpcclnt_request(rpc, mrest, procnum, td, cred, reply) #ifdef __OpenBSD__ pool_put(&rpctask_pool, task); #else - FREE(task, M_RPC); + FREE(task, M_RPCCLNT); #endif if (error) @@ -2025,7 +2025,7 @@ rpcclnt_softterm(struct rpctask * task) void rpcclnt_create(struct rpcclnt ** rpc) { - MALLOC(*rpc, struct rpcclnt *, sizeof(struct rpcclnt), M_RPC, M_WAITOK | M_ZERO); + MALLOC(*rpc, struct rpcclnt *, sizeof(struct rpcclnt), M_RPCCLNT, M_WAITOK | M_ZERO); } /* called by rpcclnt_put() */ @@ -2033,7 +2033,7 @@ void rpcclnt_destroy(struct rpcclnt * rpc) { if (rpc != NULL) { - FREE(rpc, M_RPC); + FREE(rpc, M_RPCCLNT); } else { RPCDEBUG("attempting to free a NULL rpcclnt (not dereferenced)"); } |