diotest: cleanup & fix

index 0661651..e5d223a 100644
@@ -59,6 +59,10 @@
 # define O_NOATIME 01000000
 #endif
 
+#ifndef O_DIRECT
+# define O_DIRECT 00040000
+#endif
+
 #ifndef O_PATH
 # define O_PATH 010000000
 #endif

151 lines not on this page · raw message

242 lines not on this page · raw message

244 lines not on this page · raw message

414 lines not on this page · raw message

296 lines not on this page · raw message

170 lines not on this page · raw message

153 lines not on this page · raw message

index e09889f..f5dd746 100644
@@ -1,12 +1,34 @@
-struct iovec;
-extern void fillbuf(char *buf, int count, char value);
-extern void vfillbuf(struct iovec *iv, int vcnt, char value);
-extern int filecmp(char *f1, char *f2);
-extern int bufcmp(char *b1, char *b2, int bsize);
-extern int vbufcmp(struct iovec *iv1, struct iovec *iv2, int vcnt);
+/*
+ * Copyright (c) International Business Machines  Corp., 2002
+ *  04/30/2002 Narasimha Sharoff [email protected]
+ *
+ * This program is free software;  you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ * the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program;  if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
-extern int forkchldrn(int **pidlst, int numchld, int action, int (*chldfunc)());
-extern int waitchldrn(int **pidlst, int numchld);
-extern int killchldrn(int **pidlst, int numchld, int sig);
+#ifndef DIOTEST_ROUTINES_H
+#define DIOTEST_ROUTINES_H
 
+#include "lapi/fcntl.h"
 
+void fillbuf(char *buf, int count, char value);
+void vfillbuf(struct iovec *iv, int vcnt, char value);
+int filecmp(char *f1, char *f2);
+int bufcmp(char *b1, char *b2, int bsize);
+int vbufcmp(struct iovec *iv1, struct iovec *iv2, int vcnt);
+int forkchldrn(int **pidlst, int numchld, int action, int (*chldfunc)());
+int waitchldrn(int **pidlst, int numchld);
+int killchldrn(int **pidlst, int numchld, int sig);
+
+#endif /* DIOTEST_ROUTINES_H */

index 3ccf49e..6badd93 100644
@@ -68,7 +68,7 @@
 
 char *TCID = "diotest4";
 int TST_TOTAL = 17;
-int NO_NFS = 1;
+static long fs_type;
 
 #define BUFSIZE	4096
 #define TRUE	1

@@ -269,12 +269,12 @@ int main(int argc, char *argv[])
 	lseek(fd, offset, SEEK_SET);
 	if (write(fd, buf2, 4096) == -1)
 		tst_resm(TFAIL, "can't write to file %d", ret);
-	if (NO_NFS) {
+	if (fs_type != TST_NFS_MAGIC && fs_type != TST_BTRFS_MAGIC) {
 		ret = runtest_f(fd, buf2, offset, count, EINVAL, "odd count");
 		testcheck_end(ret, &failed, &fail_count,
 					"Odd count of read and write");
 	} else
-		tst_resm(TCONF, "NFS support odd count IO");
+		tst_resm(TCONF, "filesystem supports odd count IO");
 	total++;
 
 	/* Test-4: Read beyond the file size */

@@ -447,13 +447,13 @@ int main(int argc, char *argv[])
 		tst_brkm(TBROK, cleanup, "can't open %s: %s",
 			 filename, strerror(errno));
 	}
-	if (NO_NFS) {
+	if (fs_type != TST_NFS_MAGIC && fs_type != TST_BTRFS_MAGIC) {
 		ret = runtest_f(fd, buf2 + 1, offset, count, EINVAL,
 			" nonaligned buf");
 		testcheck_end(ret, &failed, &fail_count,
 				"read, write with non-aligned buffer");
 	} else
-		tst_resm(TCONF, "NFS support read, write with non-aligned buffer");
+		tst_resm(TCONF, "filesystem supports read, write with non-aligned buffer");
 	close(fd);
 	total++;
 

@@ -573,8 +573,7 @@ static void setup(void)
 
 	close(fd1);
 
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC)
-		NO_NFS = 0;
+	fs_type = tst_fs_type(cleanup, ".");
 }
 
 static void cleanup(void)

index 0c10742..e5946bd 100644
@@ -84,49 +84,30 @@ static void prg_usage(void);
 static int runtest(int fd_r, int fd_w, int iter, off64_t offset)
 {
 	int i, bufsize = BUFSIZE;
-	struct iovec *iov1, *iov2, *iovp;
 
 	/* Allocate for buffers and data pointers */
-	iov1 = (struct iovec *) valloc(sizeof(struct iovec) * nvector);
-	if (iov1 == NULL) {
-		tst_resm(TFAIL, "valloc() buf1 failed: %s", strerror(errno));
-		return (-1);
-	}
+	char *buf1, *buf2;
 
-	iov2 = (struct iovec *) valloc(sizeof(struct iovec) * nvector);
-	if (iov2 == NULL) {
-		tst_resm(TFAIL, "valloc buf2 failed: %s", strerror(errno));
-		return (-1);
-	}
-	for (i = 0, iovp = iov1; i < nvector; iovp++, i++) {
-		iovp->iov_base = valloc(bufsize);
-		if (iovp->iov_base == NULL) {
-			tst_resm(TFAIL, "valloc for iovp->iov_base: %s",
-				 strerror(errno));
-			return (-1);
-		}
-		iovp->iov_len = bufsize;
-	}
-	for (i = 0, iovp = iov2; i < nvector; iovp++, i++) {
-		iovp->iov_base = valloc(bufsize);
-		if (iovp->iov_base == NULL) {
-			tst_resm(TFAIL, "valloc, iov2 for iovp->iov_base: %s",
-				 strerror(errno));
-			return (-1);
-		}
-		iovp->iov_len = bufsize;
+	buf1 = valloc(bufsize);
+	buf2 = valloc(bufsize);
+
+	if (!buf1 || !buf2) {
+		tst_resm(TBROK | TERRNO, "valloc() failed");
+		free(buf1);
+		free(buf2);
+		return -1;
 	}
 
 	/* Test */
 	for (i = 0; i < iter; i++) {
-		vfillbuf(iov1, nvector, i);
-		vfillbuf(iov2, nvector, i + 1);
+		fillbuf(buf1, bufsize, i);
+		fillbuf(buf2, bufsize, i + 1);
 		if (lseek(fd_w, offset, SEEK_SET) < 0) {
 			tst_resm(TFAIL, "lseek before writev failed: %s",
 				 strerror(errno));
 			return (-1);
 		}
-		if (writev(fd_w, iov1, nvector) < 0) {
+		if (write(fd_w, buf1, bufsize) < 0) {
 			tst_resm(TFAIL, "writev failed: %s", strerror(errno));
 			return (-1);
 		}

@@ -135,23 +116,16 @@ static int runtest(int fd_r, int fd_w, int iter, off64_t offset)
 				 strerror(errno));
 			return (-1);
 		}
-		if (readv(fd_r, iov2, nvector) < 0) {
+		if (read(fd_r, buf2, bufsize) < 0) {
 			tst_resm(TFAIL, "readv failed: %s", strerror(errno));
 			return (-1);
 		}
-		if (vbufcmp(iov1, iov2, nvector) != 0) {
+		if (bufcmp(buf1, buf2, bufsize) != 0) {
 			tst_resm(TFAIL, "readv/writev comparision failed");
 			return (-1);
 		}
 	}
 
-	/* Cleanup */
-	for (i = 0, iovp = iov1; i < nvector; iovp++, i++)
-		free(iovp->iov_base);
-	for (i = 0, iovp = iov2; i < nvector; iovp++, i++)
-		free(iovp->iov_base);
-	free(iov1);
-	free(iov2);
 	return 0;
 }