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-common.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-common.h')
| -rw-r--r-- | xlators/nfs/lib/src/xdr-common.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xlators/nfs/lib/src/xdr-common.h b/xlators/nfs/lib/src/xdr-common.h index 50a57ade932..0f60cd2c962 100644 --- a/xlators/nfs/lib/src/xdr-common.h +++ b/xlators/nfs/lib/src/xdr-common.h @@ -17,8 +17,8 @@ <http://www.gnu.org/licenses/>. */ -#ifndef _XDR_COMMON_H_ -#define _XDR_COMMON_H_ +#ifndef _NFS_XDR_COMMON_H_ +#define _NFS_XDR_COMMON_H_ #ifndef _CONFIG_H #define _CONFIG_H @@ -26,23 +26,23 @@ #endif #include <rpc/rpc.h> -#define XDR_BYTES_PER_UNIT 4 +#define NFS_XDR_BYTES_PER_UNIT 4 /* Returns the address of the byte that follows the * last byte used for decoding the previous xdr component. * For eg, once the RPC call for NFS has been decoded, thie macro will return * the address from which the NFS header starts. */ -#define xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private) +#define nfs_xdr_decoded_remaining_addr(xdr) ((&xdr)->x_private) /* Returns the length of the remaining record after the previous decode * operation completed. */ -#define xdr_decoded_remaining_len(xdr) ((&xdr)->x_handy) +#define nfs_xdr_decoded_remaining_len(xdr) ((&xdr)->x_handy) /* Returns the number of bytes used by the last encode operation. */ -#define xdr_encoded_length(xdr) (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base)) +#define nfs_xdr_encoded_length(xdr) (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base)) -#define xdr_decoded_length(xdr) (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base)) +#define nfs_xdr_decoded_length(xdr) (((size_t)(&xdr)->x_private) - ((size_t)(&xdr)->x_base)) #endif |