Merge branch 'maint' into next

[tools/e2fsprogs.git] / e2fsck / flushb.c

diff --git a/e2fsck/flushb.c b/e2fsck/flushb.c
index 6d23b98..6100fc6 100644 (file)
--- a/e2fsck/flushb.c
+++ b/e2fsck/flushb.c
@@ -2,54 +2,44 @@
  * flushb.c --- This routine flushes the disk buffers for a disk
  *
  * Copyright 1997, 2000, by Theodore Ts'o.
- * 
- * This program may be used under the provisions of the GNU Public
- * License, *EXCEPT* that it may not be included in the Debian
- * distribution.  (Yes, this violates the Debian Free Software
- * Guidelines.  That's the point.  I don't want this program being
- * distributed in Debian, because I don't care to support it, and the
- * maintainer, Yann Dirson, doesn't seem to pay attention to my wishes
- * on this matter.  So I'm deliberately adding this clause so it
- * violates the Debian Free Software Guidelines to force him to take
- * it out.  (What part of THIS IS FOR MY OWN USE don't you understand?
- * And no, I'm going to write a man page for it either.  And don't
- * file a bug about it or bug me about it.)  If this doesn't work,
- * I'll have to remove it from the upstream source distribution on the
- * next release.  So there.  :-)
+ *
+ * WARNING: use of flushb on some older 2.2 kernels on a heavily loaded
+ * system will corrupt filesystems.  This program is not really useful
+ * beyond for benchmarking scripts.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <sys/mount.h>
 #include "../misc/nls-enable.h"
 
-#ifdef __STDC__
-#define NOARGS void
-#else
-#define NOARGS
-#define const
-#endif
-
-/* For Linux/i386, define BLKFLSBUF */
-#if (!defined(BLKFLSBUF) && defined(__i386__))
-#define BLKFLSBUF  0x1261      /* flush buffer cache */
+/* For Linux, define BLKFLSBUF if necessary */
+#if (!defined(BLKFLSBUF) && defined(__linux__))
+#define BLKFLSBUF      _IO(0x12,97)    /* flush buffer cache */
 #endif
 
 const char *progname;
 
-static void usage(NOARGS)
+static void usage(void)
 {
        fprintf(stderr, _("Usage: %s disk\n"), progname);
        exit(1);
-}      
-       
+}
+
 int main(int argc, char **argv)
 {
        int     fd;
-       
+
        progname = argv[0];
        if (argc != 2)
                usage();