Patch from Yann Morin to put BLKGETSIZE64 in platform.h had rather a lot of

fallout due to the #include <sys/mount.h>.  Removed that #include from various
applets and fixed up those that were unhappy when that #include was made
because they'd block copied stuff out of it.  (Sigh.)

9 files changed, 10 insertions, 49 deletions

diff --git a/include/platform.h b/include/platform.h
index 3e1229e9d..5dbfb7783 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -242,8 +242,11 @@ typedef unsigned long long int  uintmax_t;
 #define bb_setpgrp setpgrp()
 #endif
 
-#if defined(__linux__) && !defined(BLKGETSIZE64)
+#if defined(__linux__)
+#include <sys/mount.h>
+#if !defined(BLKGETSIZE64)
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 #endif
+#endif
 
 #endif	/* platform.h	*/
diff --git a/miscutils/eject.c b/miscutils/eject.c
index a402e49c6..8ac66779a 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -17,7 +17,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <sys/mount.h>
 #include <mntent.h>
 
 /* various defines swiped from linux/cdrom.h */
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 81e7c6e4c..925644e1f 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -14,14 +14,12 @@
 
 #include "busybox.h"
 #include <string.h>
-#include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <ctype.h>
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>
 #include <sys/times.h>
-#include <sys/mount.h>
 #include <sys/mman.h>
 #include <linux/types.h>
 #include <linux/hdreg.h>
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 5ef5acb1b..cd8252649 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -43,11 +43,6 @@
 
 #define DKTYPENAMES
 
-#define BLKRRPART  _IO(0x12,95)    /* re-read partition table */
-#define BLKGETSIZE _IO(0x12,96)    /* return device size */
-#define BLKFLSBUF  _IO(0x12,97)    /* flush buffer cache */
-#define BLKSSZGET  _IO(0x12,104)   /* get block device sector size */
-
 /*
    fdisk.h
 */
diff --git a/util-linux/mount.c b/util-linux/mount.c
index e1c1c601b..9225289b6 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -13,7 +13,7 @@
  * bb_getopt_ulflags();
  */
 
-/* Design notes: There is no spec for this.  Remind me to write one.
+/* Design notes: There is no spec for mount.  Remind me to write one.
 
    mount_main() calls singlemount() which calls mount_it_now().
 
@@ -22,18 +22,14 @@
    mount_it_now() does the actual mount.
 */
 
-#include <limits.h>
-#include <stdlib.h>
+#include "busybox.h"
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <stdio.h>
 #include <mntent.h>
 #include <ctype.h>
-#include <sys/mount.h>
 #include <fcntl.h>		// for CONFIG_FEATURE_MOUNT_LOOP
 #include <sys/ioctl.h>  // for CONFIG_FEATURE_MOUNT_LOOP
-#include "busybox.h"
 
 // These two aren't always defined in old headers
 #ifndef MS_BIND
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index 619add483..d46cf698a 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -33,18 +33,12 @@
  * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
  */
 
+#include "busybox.h"
 #include <unistd.h>
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <netdb.h>
-#include <sys/socket.h>
 #include <time.h>
 #include <sys/utsname.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdlib.h>
-#include "busybox.h"
 #undef TRUE
 #undef FALSE
 #include <rpc/rpc.h>
@@ -121,19 +115,7 @@ enum {
 # define textdomain(Domain) /* empty */
 
 enum {
-	MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
-	MS_RDONLY = 1,      /* Mount read-only */
-	MS_NOSUID = 2,      /* Ignore suid and sgid bits */
-	MS_NODEV = 4,      /* Disallow access to device special files */
-	MS_NOEXEC = 8,      /* Disallow program execution */
-	MS_SYNCHRONOUS = 16,      /* Writes are synced at once */
-	MS_REMOUNT = 32,      /* Alter flags of a mounted FS */
-	MS_MANDLOCK = 64,      /* Allow mandatory locks on an FS */
 	S_QUOTA = 128,     /* Quota initialized for file/directory/symlink */
-	S_APPEND = 256,     /* Append-only file */
-	S_IMMUTABLE = 512,     /* Immutable file */
-	MS_NOATIME = 1024,    /* Do not update access times. */
-	MS_NODIRATIME = 2048    /* Do not update directory access times */
 };
 
 
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 473325d0c..9bb70a1f5 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -7,16 +7,13 @@
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
 
-#include <stdio.h>
+#include "busybox.h"
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
 #include <string.h>
-#include <stdlib.h>
-#include <sys/mount.h>
 #include <sys/swap.h>
 
-#include "busybox.h"
 
 static int swap_enable_disable(const char *device)
 {
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index 9815a6d9e..8e564f0bf 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -6,17 +6,12 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <dirent.h>
+#include "busybox.h"
 #include <fcntl.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/vfs.h>
 #include <unistd.h>
 
-#include "busybox.h"
 
 // Make up for header deficiencies.
 
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 7efb636db..b5696f78b 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -11,15 +11,11 @@
  *
  */
 
-#include <limits.h>
-#include <stdio.h>
+#include "busybox.h"
 #include <mntent.h>
 #include <errno.h>
 #include <string.h>
-#include <stdlib.h>
-#include <sys/mount.h>
 #include <getopt.h>
-#include "busybox.h"
 
 #define OPTION_STRING		"flDnrvad"
 #define OPT_FORCE			1