[Ocfs2-tools-commits] manish commits r933 - trunk/mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-06-09 21:04:37 -0500 (Thu, 09 Jun 2005)
New Revision: 933

Modified:
   trunk/mkfs.ocfs2/mkfs.c
Log:
Do all mkfs I/O using O_DIRECT


Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c	2005-06-10 01:38:08 UTC (rev 932)
+++ trunk/mkfs.ocfs2/mkfs.c	2005-06-10 02:04:37 UTC (rev 933)
@@ -943,10 +943,11 @@
 do_malloc(State *s, size_t size)
 {
 	void *buf;
+	int ret;
 
-	buf = malloc(size);
+	ret = posix_memalign(&buf, OCFS2_MAX_BLOCKSIZE, size);
 
-	if (buf == NULL) {
+	if (ret != 0) {
 		com_err(s->progname, 0,
 			"Could not allocate %lu bytes of memory",
 			(unsigned long)size);
@@ -1790,7 +1791,7 @@
 static void
 open_device(State *s)
 {
-	s->fd = open64(s->device_name, O_RDWR);
+	s->fd = open64(s->device_name, O_RDWR | O_DIRECT);
 
 	if (s->fd == -1) {
 		com_err(s->progname, 0,