summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-07-08 19:10:29 +0000
committerEric Andersen2000-07-08 19:10:29 +0000
commit2cd439f7f075c4b6b6c32412a8e1311d589202e3 (patch)
tree9a7d23e6772d59c474766b11b0aae10b2aeb2ea5
parentbd22ed806782eec76929bcd2ec556717e79d24c7 (diff)
downloadbusybox-2cd439f7f075c4b6b6c32412a8e1311d589202e3.zip
busybox-2cd439f7f075c4b6b6c32412a8e1311d589202e3.tar.gz
More cleanup on umount
-Erik
-rw-r--r--umount.c22
-rw-r--r--util-linux/umount.c22
2 files changed, 34 insertions, 10 deletions
diff --git a/umount.c b/umount.c
index d790d68..4f6edc2 100644
--- a/umount.c
+++ b/umount.c
@@ -26,20 +26,32 @@
#include <stdio.h>
#include <mntent.h>
#include <errno.h>
-#include <sys/mount.h>
#include <linux/unistd.h>
-/* Include our own version of umount2 if we need it... */
-#ifndef __NR_umount2
-#define __NR_umount2 52
+#ifndef MNT_FORCE
#define MNT_FORCE 1
+#endif
+#ifndef MS_MGC_VAL
#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
+#endif
+#ifndef MS_REMOUNT
#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
+#endif
+#ifndef MS_RDONLY
#define MS_RDONLY 1 /* Mount read-only. */
-
#endif
+#ifndef __NR_umount2
+#define __NR_umount2 52
+#endif
+
+/* Include our own version of <sys/mount.h>, since libc5 doesn't
+ * know about umount2 */
+static _syscall1(int, umount, const char *, special_file);
static _syscall2(int, umount2, const char *, special_file, int, flags);
+static _syscall5(int, mount, const char *, special_file, const char *, dir,
+ const char *, fstype, unsigned long int, rwflag, const void *, data);
+
static const char umount_usage[] =
diff --git a/util-linux/umount.c b/util-linux/umount.c
index d790d68..4f6edc2 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -26,20 +26,32 @@
#include <stdio.h>
#include <mntent.h>
#include <errno.h>
-#include <sys/mount.h>
#include <linux/unistd.h>
-/* Include our own version of umount2 if we need it... */
-#ifndef __NR_umount2
-#define __NR_umount2 52
+#ifndef MNT_FORCE
#define MNT_FORCE 1
+#endif
+#ifndef MS_MGC_VAL
#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
+#endif
+#ifndef MS_REMOUNT
#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
+#endif
+#ifndef MS_RDONLY
#define MS_RDONLY 1 /* Mount read-only. */
-
#endif
+#ifndef __NR_umount2
+#define __NR_umount2 52
+#endif
+
+/* Include our own version of <sys/mount.h>, since libc5 doesn't
+ * know about umount2 */
+static _syscall1(int, umount, const char *, special_file);
static _syscall2(int, umount2, const char *, special_file, int, flags);
+static _syscall5(int, mount, const char *, special_file, const char *, dir,
+ const char *, fstype, unsigned long int, rwflag, const void *, data);
+
static const char umount_usage[] =