From: Mark Nordstrand <mann@sgi.com>
Date: Fri, 2 Feb 2001 17:31:04 +0000 (+0000)
Subject: linux/xfs_fs.h
X-Git-Tag: v1.1.0~1318
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=daa9f5b7c5958374564c9986fa80aef83810d79c;p=users%2Fhch%2Fxfstests-dev.git

linux/xfs_fs.h
Turn off ERROR_INJECT_DISABLE (or turn on error injection).
---

diff --git a/src/fsstress.c b/src/fsstress.c
index 548bfd51e..b7e592d71 100644
--- a/src/fsstress.c
+++ b/src/fsstress.c
@@ -32,8 +32,6 @@
 
 #include "global.h"
 
-/* XXX temporary hack - error injection is disabled */
-#define ERROR_INJECT_DISABLE 
 #define XFS_ERRTAG_MAX		17
 
 typedef enum {
@@ -384,13 +382,9 @@ int main(int argc, char **argv)
 			errtag += (random() % (XFS_ERRTAG_MAX - errtag));
 		}
 		printf("Injecting failure on tag #%d\n", errtag);
-#ifndef ERROR_INJECT_DISABLE
 		err_inj.errtag = errtag;
 		err_inj.fd = fd;
 		srval = ioctl(fd, XFS_IOC_ERROR_INJECTION, &err_inj);
-#else
-                srval = -1;
-#endif
 		if (srval < -1) {
 			perror("fsstress - XFS_SYSSGI error injection call");
 			close(fd);
@@ -410,13 +404,10 @@ int main(int argc, char **argv)
 	while (wait(&stat) > 0)
 		continue;
 	if (errtag != 0) {
-#ifndef ERROR_INJECT_DISABLE
 		err_inj.errtag = 0;
 		err_inj.fd = fd;
 		if((srval = ioctl(fd, XFS_IOC_ERROR_CLEARALL, &err_inj)) != 0) {
-#else
-                if (1) {
-#endif
+			fprintf(stderr, "Bad ej clear on %d (%d).\n", fd, errno);
 			perror("fsstress - XFS_SYSSGI clear error injection call");
 			close(fd);
 			exit(1);