Skip to contentSkip to conversation

xfstests: fix nr of args in open calls

PATCH Superseded Eric Sandeen 2 participants 6 messages Oct 25, 2008 – Nov 12, 2008

lore
Share & tools
lore

Eric Sandeen

author
#0 lore raw

PATCH 1/1 xfstests: fix nr of args in open calls

Fix a few problematic open calls which strict checking catches; in most cases just missing a mode with O_CREAT.

Signed-off-by Eric Sandeen <[email protected]>

---

ltp/iogen.c +4 -0
Index: xfstests/ltp/iogen.c
===================================================================
@@ -1060,7 +1060,11 @@ int 	nbytes;
 
     Oflags |= O_CREAT | O_WRONLY;
 
+#ifdef CRAY
     if ((fd = open(path, Oflags, 0666, Ocbits, Ocblks)) == -1) {
+#else
+    if ((fd = open(path, Oflags, 0666)) == -1) {
+#endif
 	fprintf(stderr, "iogen%s:  Could not create/open file %s: %s (%d)\n",
 		TagName, path, SYSERR, errno);
 	return -1;
src/multi_open_unlink.c +1 -1
Index: xfstests/src/multi_open_unlink.c
===================================================================
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
 			return 1;
 		}
 
-		fd = open(path, O_RDWR|O_CREAT|O_EXCL);
+		fd = open(path, O_RDWR|O_CREAT|O_EXCL, 0666);
 		if (fd == -1) {
 			fprintf(stderr, "%s: failed to create \"%s\": %s\n", prog, path, strerror(errno));
 			return 1;
src/enospc_unlink.c +1 -1
Index: xfstests/src/enospc_unlink.c
===================================================================
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	memset(ptr, 0xffffffff, sz);
 
 	for (i = 0; i < count; i++) {
-		fd = open(argv[1], O_CREAT|O_WRONLY);
+		fd = open(argv[1], O_CREAT|O_WRONLY, 0666);
 		if (fd < 0) {
 			perror(argv[1]);
 			exit(1);
src/dmiperf.c +1 -1
Index: xfstests/src/dmiperf.c
===================================================================
@@ -203,7 +203,7 @@ mkfile(char *name, char *attr)
 	ssize_t		wrote, wsize;
 	off64_t		bytes = fsize;
 
-	if ((fd = open(name, O_WRONLY | O_CREAT | O_EXCL | O_DIRECT)) < 0) {
+	if ((fd = open(name, O_WRONLY | O_CREAT | O_EXCL | O_DIRECT, 0666)) < 0) {
 		perror("open");
 		exit(1);
 	}
#1 lore raw

ltp/iogen.c int nbytes; · line 1067

Quoted 11 lines · Eric Sandeen
ltp/iogen.c +4 -0
@@ -1060,7 +1060,11 @@ int 	nbytes;
 
     Oflags |= O_CREAT | O_WRONLY;
 
+#ifdef CRAY
     if ((fd = open(path, Oflags, 0666, Ocbits, Ocblks)) == -1) {
+#else
+    if ((fd = open(path, Oflags, 0666)) == -1) {
+#endif

Do we really need that ifdef cray here?

author
#2 lore raw
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines · Eric Sandeen
ltp/iogen.c +0 -0
@@ -1060,7 +1060,11 @@ int 	nbytes;
 
     Oflags |= O_CREAT | O_WRONLY;
Quoted 7 lines

ltp/iogen.c int nbytes; · line 1067

Quoted 5 lines
ltp/iogen.c +4 -0
+#ifdef CRAY
     if ((fd = open(path, Oflags, 0666, Ocbits, Ocblks)) == -1) {
+#else
+    if ((fd = open(path, Oflags, 0666)) == -1) {
+#endif

Do we really need that ifdef cray here?

Not sure; Ocbits etc are set under the same #ifdef, xfsqa runs on irix, and I'm not sure what all gets set on that build ...

-Eric

#3 lore raw
Quoted 16 lines · Eric Sandeen
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines · Eric Sandeen
ltp/iogen.c +0 -0
@@ -1060,7 +1060,11 @@ int 	nbytes;
 
     Oflags |= O_CREAT | O_WRONLY;
Quoted 7 lines

ltp/iogen.c int nbytes; · line 1067

Quoted 5 lines
ltp/iogen.c +4 -0
+#ifdef CRAY
     if ((fd = open(path, Oflags, 0666, Ocbits, Ocblks)) == -1) {
+#else
+    if ((fd = open(path, Oflags, 0666)) == -1) {
+#endif

Do we really need that ifdef cray here?

Quoted 2 lines

Not sure; Ocbits etc are set under the same #ifdef, xfsqa runs on irix, and I'm not sure what all gets set on that build ...

#ifdef CRAY is for Unicos, and I don't think xfsqa near it's current version can run there. I'd rather see all this striped out, but at least no new occurances added.

author
#4 lore raw

PATCH v2 1/1 xfstests: fix nr of args in open calls

In reply to Eric Sandeen

Fix a few problematic open calls which strict checking catches; in most cases just missing a mode with O_CREAT.

Removed the #ifdef CRAY instance around one, per hch's request.

Somebody else can remove the rest, when motivated.

Signed-off-by Eric Sandeen <[email protected]>

---

ltp/iogen.c +1 -1
Index: xfstests/ltp/iogen.c
===================================================================
@@ -1060,7 +1060,7 @@ int 	nbytes;
 
     Oflags |= O_CREAT | O_WRONLY;
 
-    if ((fd = open(path, Oflags, 0666, Ocbits, Ocblks)) == -1) {
+    if ((fd = open(path, Oflags, 0666)) == -1) {
 	fprintf(stderr, "iogen%s:  Could not create/open file %s: %s (%d)\n",
 		TagName, path, SYSERR, errno);
 	return -1;
src/multi_open_unlink.c +1 -1
Index: xfstests/src/multi_open_unlink.c
===================================================================
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
 			return 1;
 		}
 
-		fd = open(path, O_RDWR|O_CREAT|O_EXCL);
+		fd = open(path, O_RDWR|O_CREAT|O_EXCL, 0666);
 		if (fd == -1) {
 			fprintf(stderr, "%s: failed to create \"%s\": %s\n", prog, path, strerror(errno));
 			return 1;
src/enospc_unlink.c +1 -1
Index: xfstests/src/enospc_unlink.c
===================================================================
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	memset(ptr, 0xffffffff, sz);
 
 	for (i = 0; i < count; i++) {
-		fd = open(argv[1], O_CREAT|O_WRONLY);
+		fd = open(argv[1], O_CREAT|O_WRONLY, 0666);
 		if (fd < 0) {
 			perror(argv[1]);
 			exit(1);
src/dmiperf.c +1 -1
Index: xfstests/src/dmiperf.c
===================================================================
@@ -203,7 +203,7 @@ mkfile(char *name, char *attr)
 	ssize_t		wrote, wsize;
 	off64_t		bytes = fsize;
 
-	if ((fd = open(name, O_WRONLY | O_CREAT | O_EXCL | O_DIRECT)) < 0) {
+	if ((fd = open(name, O_WRONLY | O_CREAT | O_EXCL | O_DIRECT, 0666)) < 0) {
 		perror("open");
 		exit(1);
 	}
#5 lore raw

Folks can we please get this in? This is breaking the xfstests build on any modern distro.

Quoted 56 lines · Eric Sandeen

Fix a few problematic open calls which strict checking catches; in most cases just missing a mode with O_CREAT.

Removed the #ifdef CRAY instance around one, per hch's request.

Somebody else can remove the rest, when motivated.

Signed-off-by Eric Sandeen <[email protected]>

---

Index: xfstests/ltp/iogen.c
===================================================================

ltp/iogen.c +1 -1
@@ -1060,7 +1060,7 @@ int 	nbytes;
 
     Oflags |= O_CREAT | O_WRONLY;
 
-    if ((fd = open(path, Oflags, 0666, Ocbits, Ocblks)) == -1) {
+    if ((fd = open(path, Oflags, 0666)) == -1) {
 	fprintf(stderr, "iogen%s:  Could not create/open file %s: %s (%d)\n",
 		TagName, path, SYSERR, errno);
 	return -1;

Index: xfstests/src/multi_open_unlink.c
===================================================================

src/multi_open_unlink.c +1 -1
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
 			return 1;
 		}
 
-		fd = open(path, O_RDWR|O_CREAT|O_EXCL);
+		fd = open(path, O_RDWR|O_CREAT|O_EXCL, 0666);
 		if (fd == -1) {
 			fprintf(stderr, "%s: failed to create \"%s\": %s\n", prog, path, strerror(errno));
 			return 1;

Index: xfstests/src/enospc_unlink.c
===================================================================

src/enospc_unlink.c +1 -1
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	memset(ptr, 0xffffffff, sz);
 
 	for (i = 0; i < count; i++) {
-		fd = open(argv[1], O_CREAT|O_WRONLY);
+		fd = open(argv[1], O_CREAT|O_WRONLY, 0666);
 		if (fd < 0) {
 			perror(argv[1]);
 			exit(1);

Index: xfstests/src/dmiperf.c
===================================================================

src/dmiperf.c mkfile(char *name, char *attr) · line 209

Quoted 8 lines
src/dmiperf.c +1 -1
@@ -203,7 +203,7 @@ mkfile(char *name, char *attr)
 	ssize_t		wrote, wsize;
 	off64_t		bytes = fsize;
 
-	if ((fd = open(name, O_WRONLY | O_CREAT | O_EXCL | O_DIRECT)) < 0) {
+	if ((fd = open(name, O_WRONLY | O_CREAT | O_EXCL | O_DIRECT, 0666)) < 0) {
 		perror("open");
 		exit(1);
 	}

---end quoted text---