From: Nathan Scott <nathans@sgi.com>
Date: Tue, 6 Mar 2001 21:43:21 +0000 (+0000)
Subject: reenable use of direct IO now that DIOCINFO and O_DIRECT are working.
X-Git-Tag: v1.2.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37cb1ae19d01f93a944756479171c572aca5519c;p=thirdparty%2Fxfsprogs-dev.git

reenable use of direct IO now that DIOCINFO and O_DIRECT are working.
---

diff --git a/mkfile/xfs_mkfile.c b/mkfile/xfs_mkfile.c
index f880d932c..c7745a93c 100644
--- a/mkfile/xfs_mkfile.c
+++ b/mkfile/xfs_mkfile.c
@@ -44,12 +44,10 @@
 #include <errno.h>
 #include <libxfs.h>
 
-#undef O_DIRECT
-#define O_DIRECT 0	/* nathans TODO - remove this when direct IO done */
-
 #define	MAXBUFFERSIZE	(256 * 1024)
 
 static void usage(void);
+static char *progname;
 
 int
 main(int argc, char **argv)
@@ -68,7 +66,6 @@ main(int argc, char **argv)
 	int prealloc = 0;
 	int verbose = 0;
 	struct dioattr da;
-	char *progname;
 	void *buf = NULL;
 	int buflen = 0, nbuflen;
 	int bufalign = 0, nbufalign, bufmin;
@@ -279,6 +276,6 @@ main(int argc, char **argv)
 static void
 usage(void)
 {
-	fprintf(stderr, "mkfile: [-npv] <size> <name1> [<name2>] ...\n");
+	fprintf(stderr, "%s: [-npv] <size> <name1> [<name2>] ...\n", progname);
 	exit(2);
 }