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/rpc-socket.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/rpc-socket.h')
-rw-r--r-- | xlators/nfs/lib/src/rpc-socket.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/xlators/nfs/lib/src/rpc-socket.h b/xlators/nfs/lib/src/rpc-socket.h index 3a50c97a98d..d95e5ddd65b 100644 --- a/xlators/nfs/lib/src/rpc-socket.h +++ b/xlators/nfs/lib/src/rpc-socket.h @@ -17,8 +17,8 @@ <http://www.gnu.org/licenses/>. */ -#ifndef _RPCSVC_SOCKET_H_ -#define _RPCSVC_SOCKET_H_ +#ifndef _NFS_RPCSVC_SOCKET_H_ +#define _NFS_RPCSVC_SOCKET_H_ #ifndef _CONFIG_H #define _CONFIG_H @@ -40,26 +40,26 @@ #define SA(ptr) ((struct sockaddr *)ptr) #define GF_RPCSVC_SOCK "rpc-socket" extern int -rpcsvc_socket_listen (int addrfam, char *listenhost, uint16_t listenport); +nfs_rpcsvc_socket_listen (int addrfam, char *listenhost, uint16_t listenport); extern int -rpcsvc_socket_accept (int listenfd); +nfs_rpcsvc_socket_accept (int listenfd); extern ssize_t -rpcsvc_socket_read (int sockfd, char *readaddr, size_t readsize); +nfs_rpcsvc_socket_read (int sockfd, char *readaddr, size_t readsize); extern ssize_t -rpcsvc_socket_write (int sockfd, char *buffer, size_t size); +nfs_rpcsvc_socket_write (int sockfd, char *buffer, size_t size); extern int -rpcsvc_socket_peername (int sockfd, char *hostname, int hostlen); +nfs_rpcsvc_socket_peername (int sockfd, char *hostname, int hostlen); extern int -rpcsvc_socket_peeraddr (int sockfd, char *addrstr, int addrlen, - struct sockaddr *returnsa, socklen_t sasize); +nfs_rpcsvc_socket_peeraddr (int sockfd, char *addrstr, int addrlen, + struct sockaddr *returnsa, socklen_t sasize); extern int -rpcsvc_socket_block_tx (int sockfd); +nfs_rpcsvc_socket_block_tx (int sockfd); extern int -rpcsvc_socket_unblock_tx (int sockfd); +nfs_rpcsvc_socket_unblock_tx (int sockfd); #endif |