diff options
author | Shehjar Tikoo <shehjart@gluster.com> | 2010-08-10 02:41:54 +0000 |
---|---|---|
committer | Anand V. Avati <avati@dev.gluster.com> | 2010-08-10 02:44:22 -0700 |
commit | 0af39ff8d03173a7ba3df1b13476b7ed447131aa (patch) | |
tree | 2180ff57269b73aa8fee6a5802a8d5d4a169f624 /xlators/nfs/lib/src/xdr-rpc.h | |
parent | b0304d47f67aa8fa677e4898fa46b96df88c8322 (diff) |
nfs, nfs/rpc: Rename functions to prevent gfrpcsvc conflict
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1274 (nfs fails to start)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1274
Diffstat (limited to 'xlators/nfs/lib/src/xdr-rpc.h')
-rw-r--r-- | xlators/nfs/lib/src/xdr-rpc.h | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/xlators/nfs/lib/src/xdr-rpc.h b/xlators/nfs/lib/src/xdr-rpc.h index 48acdaa4399..f8dbd33b75b 100644 --- a/xlators/nfs/lib/src/xdr-rpc.h +++ b/xlators/nfs/lib/src/xdr-rpc.h @@ -17,8 +17,8 @@ <http://www.gnu.org/licenses/>. */ -#ifndef _XDR_RPC_H -#define _XDR_RPC_H_ +#ifndef _NFS_XDR_RPC_H +#define _NFS_XDR_RPC_H_ #ifndef _CONFIG_H #define _CONFIG_H @@ -35,48 +35,48 @@ * that contains everything an RPC call needs to work. */ extern int -xdr_to_rpc_call (char *msgbuf, size_t len, struct rpc_msg *call, - struct iovec *payload, char *credbytes, char *verfbytes); +nfs_xdr_to_rpc_call (char *msgbuf, size_t len, struct rpc_msg *call, + struct iovec *payload, char *credbytes, char *verfbytes); extern int -rpc_fill_empty_reply (struct rpc_msg *reply, uint32_t xid); +nfs_rpc_fill_empty_reply (struct rpc_msg *reply, uint32_t xid); extern int -rpc_fill_denied_reply (struct rpc_msg *reply, int rjstat, int auth_err); +nfs_rpc_fill_denied_reply (struct rpc_msg *reply, int rjstat, int auth_err); extern int -rpc_fill_accepted_reply (struct rpc_msg *reply, int arstat, int proglow, - int proghigh, int verf, int len, char *vdata); +nfs_rpc_fill_accepted_reply (struct rpc_msg *reply, int arstat, int proglow, + int proghigh, int verf, int len, char *vdata); extern int -rpc_reply_to_xdr (struct rpc_msg *reply, char *dest, size_t len, - struct iovec *dst); +nfs_rpc_reply_to_xdr (struct rpc_msg *reply, char *dest, size_t len, + struct iovec *dst); extern int -xdr_to_auth_unix_cred (char *msgbuf, int msglen, struct authunix_parms *au, - char *machname, gid_t *gids); +nfs_xdr_to_auth_unix_cred (char *msgbuf, int msglen, struct authunix_parms *au, + char *machname, gid_t *gids); /* Macros that simplify accesing the members of an RPC call structure. */ -#define rpc_call_xid(call) ((call)->rm_xid) -#define rpc_call_direction(call) ((call)->rm_direction) -#define rpc_call_rpcvers(call) ((call)->ru.RM_cmb.cb_rpcvers) -#define rpc_call_program(call) ((call)->ru.RM_cmb.cb_prog) -#define rpc_call_progver(call) ((call)->ru.RM_cmb.cb_vers) -#define rpc_call_progproc(call) ((call)->ru.RM_cmb.cb_proc) -#define rpc_opaque_auth_flavour(oa) ((oa)->oa_flavor) -#define rpc_opaque_auth_len(oa) ((oa)->oa_length) +#define nfs_rpc_call_xid(call) ((call)->rm_xid) +#define nfs_rpc_call_direction(call) ((call)->rm_direction) +#define nfs_rpc_call_rpcvers(call) ((call)->ru.RM_cmb.cb_rpcvers) +#define nfs_rpc_call_program(call) ((call)->ru.RM_cmb.cb_prog) +#define nfs_rpc_call_progver(call) ((call)->ru.RM_cmb.cb_vers) +#define nfs_rpc_call_progproc(call) ((call)->ru.RM_cmb.cb_proc) +#define nfs_rpc_opaque_auth_flavour(oa) ((oa)->oa_flavor) +#define nfs_rpc_opaque_auth_len(oa) ((oa)->oa_length) -#define rpc_call_cred_flavour(call) (rpc_opaque_auth_flavour ((&(call)->ru.RM_cmb.cb_cred))) -#define rpc_call_cred_len(call) (rpc_opaque_auth_len ((&(call)->ru.RM_cmb.cb_cred))) +#define nfs_rpc_call_cred_flavour(call) (nfs_rpc_opaque_auth_flavour ((&(call)->ru.RM_cmb.cb_cred))) +#define nfs_rpc_call_cred_len(call) (nfs_rpc_opaque_auth_len ((&(call)->ru.RM_cmb.cb_cred))) -#define rpc_call_verf_flavour(call) (rpc_opaque_auth_flavour ((&(call)->ru.RM_cmb.cb_verf))) -#define rpc_call_verf_len(call) (rpc_opaque_auth_len ((&(call)->ru.RM_cmb.cb_verf))) +#define nfs_rpc_call_verf_flavour(call) (nfs_rpc_opaque_auth_flavour ((&(call)->ru.RM_cmb.cb_verf))) +#define nfs_rpc_call_verf_len(call) (nfs_rpc_opaque_auth_len ((&(call)->ru.RM_cmb.cb_verf))) extern int -xdr_bytes_round_up (struct iovec *vec, size_t bufsize); +nfs_xdr_bytes_round_up (struct iovec *vec, size_t bufsize); extern ssize_t -xdr_length_round_up (size_t len, size_t bufsize); +nfs_xdr_length_round_up (size_t len, size_t bufsize); void -xdr_vector_round_up (struct iovec *vec, int vcount, uint32_t count); +nfs_xdr_vector_round_up (struct iovec *vec, int vcount, uint32_t count); #endif |