summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorEric Andersen2000-07-08 18:55:24 +0000
committerEric Andersen2000-07-08 18:55:24 +0000
commitbd22ed806782eec76929bcd2ec556717e79d24c7 (patch)
treee225367aaef198eacec8ed0b530d36a9d888d92f /util-linux
parent877a71bbf0b8386add4631c08f7101259ad2dc07 (diff)
downloadbusybox-bd22ed806782eec76929bcd2ec556717e79d24c7.zip
busybox-bd22ed806782eec76929bcd2ec556717e79d24c7.tar.gz
Update files to reduce dependance on kernel version...
-Erik
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/dmesg.c2
-rw-r--r--util-linux/fdflush.c3
-rw-r--r--util-linux/mount.c8
-rw-r--r--util-linux/umount.c20
4 files changed, 18 insertions, 15 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 20846f7..e88f549 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -16,7 +16,6 @@
*/
#include "internal.h"
-#include <linux/unistd.h>
#include <stdio.h>
#include <stdlib.h>
@@ -24,6 +23,7 @@
#ifndef __alpha__
# define __NR_klogctl __NR_syslog
+#include <linux/unistd.h>
static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
#else /* __alpha__ */
#define klogctl syslog
diff --git a/util-linux/fdflush.c b/util-linux/fdflush.c
index 81f0472..d993735 100644
--- a/util-linux/fdflush.c
+++ b/util-linux/fdflush.c
@@ -24,9 +24,10 @@
#include "internal.h"
#include <stdio.h>
#include <sys/ioctl.h>
-#include <linux/fd.h>
#include <fcntl.h>
+/* From <linux/fd.h> */
+#define FDFLUSH _IO(2,0x4b)
extern int fdflush_main(int argc, char **argv)
{
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 76f048b..01e9b3d 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -48,15 +48,17 @@
#if defined BB_FEATURE_USE_DEVPS_PATCH
#include <linux/devmtab.h>
#endif
-#ifndef MS_RDONLY
-#include <linux/fs.h>
+
+/* 2.0.x. kernels don't know about MS_NODIRATIME */
+#ifndef MS_NODIRATIME
+#define MS_NODIRATIME 2048 /* Do not update directory access times */
#endif
+
#if defined BB_FEATURE_MOUNT_LOOP
#include <fcntl.h>
#include <sys/ioctl.h>
-#include <linux/loop.h>
static int use_loop = FALSE;
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 61f7f90..d790d68 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -26,20 +26,20 @@
#include <stdio.h>
#include <mntent.h>
#include <errno.h>
+#include <sys/mount.h>
#include <linux/unistd.h>
-//#include <sys/mount.h>
-/* 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);
+/* Include our own version of umount2 if we need it... */
+#ifndef __NR_umount2
+#define __NR_umount2 52
#define MNT_FORCE 1
-#define MS_MGC_VAL 0xc0ed0000 /* Magic flag number to indicate "new" flags */
-#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
-#define MS_RDONLY 1 /* Mount read-only. */
+#define MS_MGC_VAL 0xc0ed0000 /* Magic number indicatng "new" flags */
+#define MS_REMOUNT 32 /* Alter flags of a mounted FS. */
+#define MS_RDONLY 1 /* Mount read-only. */
+
+#endif
+static _syscall2(int, umount2, const char *, special_file, int, flags);
static const char umount_usage[] =