diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2007-07-28 17:50:55 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-07-30 16:12:54 +1000 |
| commit | a786c016f0af6fa116ae2483d6261dbed009d87e (patch) | |
| tree | e26233c2b3e9d8c96ee6941b478c6c39774722e5 /utils | |
| parent | 612141ad76b47cb3d7ae505795d6a1ca45b77201 (diff) | |
| download | nfs-utils-a786c016f0af6fa116ae2483d6261dbed009d87e.tar.gz nfs-utils-a786c016f0af6fa116ae2483d6261dbed009d87e.tar.xz nfs-utils-a786c016f0af6fa116ae2483d6261dbed009d87e.zip | |
libnfs.a: eliminate conn.c and conn.h
conn.[ch] are now no longer needed. Clean them out and delete them.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/mount/network.c | 1 | ||||
| -rw-r--r-- | utils/mount/network.h | 21 | ||||
| -rw-r--r-- | utils/mount/nfs4mount.c | 1 | ||||
| -rw-r--r-- | utils/mount/nfsmount.c | 1 | ||||
| -rw-r--r-- | utils/mount/nfsumount.c | 1 |
5 files changed, 20 insertions, 5 deletions
diff --git a/utils/mount/network.c b/utils/mount/network.c index af37ef6..efedf25 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -34,7 +34,6 @@ #include <rpc/pmap_clnt.h> #include <sys/socket.h> -#include "conn.h" #include "xcommon.h" #include "mount.h" #include "nls.h" diff --git a/utils/mount/network.h b/utils/mount/network.h index 0f24a32..2e4dbbc 100644 --- a/utils/mount/network.h +++ b/utils/mount/network.h @@ -21,12 +21,31 @@ * */ -#include "conn.h" +#include <rpc/pmap_prot.h> +#include <rpc/clnt.h> + #include "mount.h" +#ifdef HAVE_RPCSVC_NFS_PROT_H +#include <rpcsvc/nfs_prot.h> +#else +#include <linux/nfs.h> +#define nfsstat nfs_stat +#endif + #define MNT_SENDBUFSIZE (2048U) #define MNT_RECVBUFSIZE (1024U) +typedef struct { + char **hostname; + struct sockaddr_in saddr; + struct pmap pmap; +} clnt_addr_t; + +/* RPC call timeout values */ +static const struct timeval TIMEOUT = { 20, 0 }; +static const struct timeval RETRY_TIMEOUT = { 3, 0 }; + int probe_bothports(clnt_addr_t *, clnt_addr_t *); int nfs_gethostbyname(const char *, struct sockaddr_in *); int nfs_call_umount(clnt_addr_t *, dirpath *); diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c index 52b0261..e1b2c3b 100644 --- a/utils/mount/nfs4mount.c +++ b/utils/mount/nfs4mount.c @@ -39,7 +39,6 @@ #include "pseudoflavors.h" #include "nls.h" -#include "conn.h" #include "xcommon.h" #include "mount_constants.h" diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c index 49d6f3c..bd3403c 100644 --- a/utils/mount/nfsmount.c +++ b/utils/mount/nfsmount.c @@ -56,7 +56,6 @@ #include <paths.h> #include <syslog.h> -#include "conn.h" #include "xcommon.h" #include "mount.h" #include "nfs_mount.h" diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c index 86fb6a2..0c66717 100644 --- a/utils/mount/nfsumount.c +++ b/utils/mount/nfsumount.c @@ -29,7 +29,6 @@ #include "xcommon.h" #include "fstab.h" #include "nls.h" -#include "conn.h" #include "mount_constants.h" #include "mount.h" |