diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-07-15 13:59:00 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2008-07-15 13:59:00 -0400 |
| commit | 8dfb9661a132a206c10067f40e274cf797dab1b2 (patch) | |
| tree | 6ef1e0e1a4db8aab7880b4fa8fc6bd4f495ce447 | |
| parent | 1a1d3757d8881000496b838ff7d1ede981e9c40d (diff) | |
| download | nfs-utils-8dfb9661a132a206c10067f40e274cf797dab1b2.tar.gz nfs-utils-8dfb9661a132a206c10067f40e274cf797dab1b2.tar.xz nfs-utils-8dfb9661a132a206c10067f40e274cf797dab1b2.zip | |
Clean up: Include the bare minimum of legacy RPC headers in
utils/mount/network.h.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/mount/error.c | 2 | ||||
| -rw-r--r-- | utils/mount/mount.c | 1 | ||||
| -rw-r--r-- | utils/mount/network.c | 11 | ||||
| -rw-r--r-- | utils/mount/network.h | 10 | ||||
| -rw-r--r-- | utils/mount/nfs4mount.c | 2 | ||||
| -rw-r--r-- | utils/mount/nfsmount.c | 7 |
6 files changed, 9 insertions, 24 deletions
diff --git a/utils/mount/error.c b/utils/mount/error.c index 5fd5705..5c9d3f2 100644 --- a/utils/mount/error.c +++ b/utils/mount/error.c @@ -35,8 +35,6 @@ #include <fcntl.h> #include <syslog.h> #include <rpc/rpc.h> -#include <rpc/pmap_prot.h> -#include <rpc/pmap_clnt.h> #include "xcommon.h" #include "nls.h" diff --git a/utils/mount/mount.c b/utils/mount/mount.c index d0eb1a0..06e2804 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -44,7 +44,6 @@ #include "nfs4_mount.h" #include "mount.h" #include "error.h" -#include "network.h" #include "stropts.h" #include "version.h" diff --git a/utils/mount/network.c b/utils/mount/network.c index d8e6e10..7d3d09a 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -48,17 +48,6 @@ #include "mount_constants.h" #include "network.h" -#ifdef HAVE_RPCSVC_NFS_PROT_H -#include <rpcsvc/nfs_prot.h> -#else -#include <linux/nfs.h> -#define nfsstat nfs_stat -#endif - -#ifndef NFS_PORT -#define NFS_PORT 2049 -#endif - #define PMAP_TIMEOUT (10) #define CONNECT_TIMEOUT (20) #define MOUNT_TIMEOUT (30) diff --git a/utils/mount/network.h b/utils/mount/network.h index 544ac93..a4dba1b 100644 --- a/utils/mount/network.h +++ b/utils/mount/network.h @@ -25,16 +25,6 @@ #define _NFS_UTILS_MOUNT_NETWORK_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) diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c index 2b0fe2e..a2f318f 100644 --- a/utils/mount/nfs4mount.c +++ b/utils/mount/nfs4mount.c @@ -34,6 +34,7 @@ #include <arpa/inet.h> #include <rpc/auth.h> #include <rpc/rpc.h> + #ifdef HAVE_RPCSVC_NFS_PROT_H #include <rpcsvc/nfs_prot.h> #else @@ -45,6 +46,7 @@ #include "nls.h" #include "xcommon.h" +#include "mount.h" #include "mount_constants.h" #include "nfs4_mount.h" #include "nfs_mount.h" diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c index b343a1f..6355681 100644 --- a/utils/mount/nfsmount.c +++ b/utils/mount/nfsmount.c @@ -69,6 +69,13 @@ #include "network.h" #include "version.h" +#ifdef HAVE_RPCSVC_NFS_PROT_H +#include <rpcsvc/nfs_prot.h> +#else +#include <linux/nfs.h> +#define nfsstat nfs_stat +#endif + #ifndef NFS_PORT #define NFS_PORT 2049 #endif |