Clean up: Include the bare minimum of legacy RPC headers in utils/mount/network.h. Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> --- utils/mount/error.c | 2 -- utils/mount/mount.c | 1 - utils/mount/network.c | 11 ----------- utils/mount/network.h | 10 ---------- utils/mount/nfs4mount.c | 2 ++ 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 a7d5733..a806c7a 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 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
