[Ltp-cvs] ltp/testcases/kernel/io/disktest io.c,1.1,1.2 parse.c,1.2,1.3

[<ro...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/io/disktest
In directory sc8-pr-cvs1:/tmp/cvs-serv31590

Modified Files:
	io.c parse.c 
Log Message:
Added code to handle cases where direct I/O is not supported.


Index: io.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/io/disktest/io.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- io.c	17 Apr 2003 15:22:46 -0000	1.1
+++ io.c	7 May 2003 16:38:52 -0000	1.2
@@ -24,6 +24,9 @@
 *
 * $Id$
 * $Log$
+* Revision 1.2  2003/05/07 16:38:52  robbiew
+* Added code to handle cases where direct I/O is not supported.
+*
 * Revision 1.1  2003/04/17 15:22:46  robbiew
 * Updated to v1.1.10
 *
@@ -194,8 +197,10 @@
 #ifdef CLD_FLG_FILE
 	if(flags & CLD_FLG_FILE) OPEN_MASK |= O_CREAT;
 #endif
-#ifdef CLD_FLG_DIRECT
+#ifdef CLD_FLG_DIRECT 
+#ifdef O_DIRECT
 	if(flags & CLD_FLG_DIRECT) OPEN_MASK |= O_DIRECT;
+#endif
 #endif
 	fd = open(filespec,OPEN_MASK,00600);
 #endif

Index: parse.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/io/disktest/parse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- parse.c	17 Apr 2003 15:21:57 -0000	1.2
+++ parse.c	7 May 2003 16:38:52 -0000	1.3
@@ -24,6 +24,9 @@
 *
 * $Id$
 * $Log$
+* Revision 1.3  2003/05/07 16:38:52  robbiew
+* Added code to handle cases where direct I/O is not supported.
+*
 * Revision 1.2  2003/04/17 15:21:57  robbiew
 * Updated to v1.1.10
 *
@@ -415,7 +418,12 @@
 					}
 				}
 				if (strchr(optarg,'D') || strchr(optarg,'d'))
+#ifdef O_DIRECT
 					args->flags |= CLD_FLG_DIRECT;
+#else
+					pMsg(WARN, "This system does not support direct I/O\n");
+					return(-1);
+#endif
 				break;
 			case 'T' :
 				if(optarg == NULL) {