libnfs.a: move more mount-only functions out of libnfs.a
Subsystems (2)
PATCH 17/23 libnfs.a: move more mount-only functions out of libnfs.a
Continue clean-up with nfsvers_to_mnt() and mntvers_to_nfs().
Signed-off-by Chuck Lever <[email protected]>
---
support/include/conn.h | 2 -- support/nfs/conn.c | 18 ------------------ utils/mount/network.c | 34 ++++++++++++++++++++++++++++++++++ utils/mount/network.h | 2 ++ 4 files changed, 36 insertions(+), 20 deletions(-)
support/include/conn.h +0 -2
@@ -30,8 +30,6 @@ static const struct timeval RETRY_TIMEOUT = { 3, 0 };int clnt_ping (struct sockaddr_in *,const u_long ,const u_long ,const u_int ,struct sockaddr_in *); -u_long nfsvers_to_mnt (const u_long ); -u_long mntvers_to_nfs (const u_long );int get_socket (struct sockaddr_in *,u_int ,int ,int );#endif /* _CONN_H */
support/nfs/conn.c +0 -18
@@ -25,24 +25,6 @@extern int verbose; -/* Map an NFS version into the corresponding Mountd version */ -u_long nfsvers_to_mnt (const u_long vers) -{ -static const u_long nfs_to_mnt[] = {0 ,0 ,1 ,3 }; -if (vers <=3 ) -return nfs_to_mnt[vers]; -return 0 ; -} - -/* Map a Mountd version into the corresponding NFS version */ -u_long mntvers_to_nfs (const u_long vers) -{ -static const u_long mnt_to_nfs[] = {0 ,2 ,2 ,3 }; -if (vers <=3 ) -return mnt_to_nfs[vers]; -return 0 ; -} -/* * Create a socket that is locally bound to a * reserve or non-reserve port. For any failures,
utils/mount/network.c +34 -0
@@ -57,6 +57,40 @@ extern int nfs_mount_data_version;extern char *progname;extern int verbose; +static const unsigned long nfs_to_mnt[] = { +0 , +0 , +1 , +3 , +}; + +static const unsigned long mnt_to_nfs[] = { +0 , +2 , +2 , +3 , +}; + +/* +* Map an NFS version into the corresponding Mountd version +*/ +unsigned long nfsvers_to_mnt (const unsigned long vers) +{ +if (vers <=3 ) +return nfs_to_mnt[vers]; +return 0 ; +} + +/* +* Map a Mountd version into the corresponding NFS version +*/ +static unsigned long mntvers_to_nfs (const unsigned long vers) +{ +if (vers <=3 ) +return mnt_to_nfs[vers]; +return 0 ; +} +static const unsigned int probe_udp_only[] = {IPPROTO_UDP ,0 ,
utils/mount/network.h +2 -0
@@ -33,5 +33,7 @@ int nfs_call_umount(clnt_addr_t *, dirpath *);int start_statd (void ); +unsigned long nfsvers_to_mnt (const unsigned long ); +CLIENT *mnt_openclnt (clnt_addr_t *,int *);void mnt_closeclnt (CLIENT *,int );
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs