diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2007-07-28 17:50:14 -0400 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2007-07-30 16:12:53 +1000 |
commit | a3c8371b4f4cf9f0ff93ca040cac13dc4806ded9 (patch) | |
tree | 2dfa07c77e57acca300eb792ae2c5b3c390a7f5a | |
parent | f677d6b430927f5141c89874c649a7650a831550 (diff) | |
download | nfs-utils-a3c8371b4f4cf9f0ff93ca040cac13dc4806ded9.tar.gz nfs-utils-a3c8371b4f4cf9f0ff93ca040cac13dc4806ded9.tar.xz nfs-utils-a3c8371b4f4cf9f0ff93ca040cac13dc4806ded9.zip |
umount.nfs: eliminate a nearly empty header file.
Clean-up: move nfsumount() global declaration to nfs_mount.h, and remove
nfsumount.h.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r-- | utils/mount/mount.c | 1 | ||||
-rw-r--r-- | utils/mount/network.c | 1 | ||||
-rw-r--r-- | utils/mount/nfs_mount.h | 3 | ||||
-rw-r--r-- | utils/mount/nfsmount.c | 1 | ||||
-rw-r--r-- | utils/mount/nfsumount.c | 1 | ||||
-rw-r--r-- | utils/mount/nfsumount.h | 9 |
6 files changed, 2 insertions, 14 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 64a2b75..d6d527c 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -39,7 +39,6 @@ #include "nfs_mount.h" #include "nfs4_mount.h" -#include "nfsumount.h" #include "mount.h" #include "error.h" #include "network.h" diff --git a/utils/mount/network.c b/utils/mount/network.c index 12fc762..21cf4ef 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -38,7 +38,6 @@ #include "xcommon.h" #include "mount.h" #include "nls.h" -#include "nfsumount.h" #include "nfs_mount.h" #include "mount_constants.h" #include "network.h" diff --git a/utils/mount/nfs_mount.h b/utils/mount/nfs_mount.h index 279ff36..dcce370 100644 --- a/utils/mount/nfs_mount.h +++ b/utils/mount/nfs_mount.h @@ -80,6 +80,7 @@ struct nfs_mount_data { #define AUTH_GSS_SPKMP 390011 #endif -int nfsmount(const char *, const char *, int , char **, int); +int nfsmount(const char *, const char *, int , char **, int); +int nfsumount(int, char **); #endif /* _NFS_MOUNT_H */ diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c index 6371d77..49d6f3c 100644 --- a/utils/mount/nfsmount.c +++ b/utils/mount/nfsmount.c @@ -59,7 +59,6 @@ #include "conn.h" #include "xcommon.h" #include "mount.h" -#include "nfsumount.h" #include "nfs_mount.h" #include "mount_constants.h" #include "nls.h" diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c index a15e524..86fb6a2 100644 --- a/utils/mount/nfsumount.c +++ b/utils/mount/nfsumount.c @@ -33,7 +33,6 @@ #include "mount_constants.h" #include "mount.h" -#include "nfsumount.h" #include "error.h" #include "network.h" diff --git a/utils/mount/nfsumount.h b/utils/mount/nfsumount.h deleted file mode 100644 index 0d67d27..0000000 --- a/utils/mount/nfsumount.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _NFS_UMOUNT_H -#define _NFS_UMOUNT_H - -#include "conn.h" -#include "mount.h" - -int nfsumount(int, char **); - -#endif |