Commit 630421f6d449 attempts to avoid printing the "fallocate not
supported" warning if the -q (quiet) option is specified on the
command-line. Unfortunately tests 75 and 112 don't set the -q flag.
This causes test failures for file systems that don't support
fallocate or the punch hole functionality.
I considered changing tests 75 and 112 to pass -q to fsx, but that
would suppress other warning messages that could be legitimate test
failures, so I decided to add a new -v (vebose) flag.
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
---
ltp/fsx.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ltp/fsx.c b/ltp/fsx.c
index 36b38f7..cef2c7d 100644
--- a/ltp/fsx.c
+++ b/ltp/fsx.c
@@ -132,6 +132,7 @@ int readbdy = 1; /* -r flag */
int style = 0; /* -s flag */
int prealloc = 0; /* -x flag */
int truncbdy = 1; /* -t flag */
+int verbose = 0; /* -v flag */
int writebdy = 1; /* -w flag */
long monitorstart = -1; /* -m flag */
long monitorend = -1; /* -m flag */
@@ -1299,8 +1300,8 @@ test_fallocate()
#ifdef FALLOCATE
if (!lite && fallocate_calls) {
if (fallocate(fd, 0, 0, 1) && errno == EOPNOTSUPP) {
- if(!quiet)
- warn("main: filesystem does not support fallocate, disabling\n");
+ if (verbose)
+ warn("main: filesystem does not support fallocate, disabling");
fallocate_calls = 0;
} else {
ftruncate(fd, 0);
@@ -1319,7 +1320,7 @@ test_punch_hole()
if (!lite && punch_hole_calls) {
if (fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
0, 1) && errno == EOPNOTSUPP) {
- if(!quiet)
+ if (verbose)
warn("main: filesystem does not support fallocate punch hole, disabling");
punch_hole_calls = 0;
} else
@@ -1348,7 +1349,7 @@ main(int argc, char **argv)
setvbuf(stdout, (char *)0, _IOLBF, 0); /* line buffered stdout */
- while ((ch = getopt(argc, argv, "b:c:dfl:m:no:p:qr:s:t:w:xyAD:FHLN:OP:RS:WZ"))
+ while ((ch = getopt(argc, argv, "b:c:dfl:m:no:p:qr:s:t:vw:xyAD:FHLN:OP:RS:WZ"))
!= EOF)
switch (ch) {
case 'b':
@@ -1423,6 +1424,9 @@ main(int argc, char **argv)
if (truncbdy <= 0)
usage();
break;
+ case 'v':
+ verbose = 1;
+ break;
case 'w':
writebdy = getnum(optarg, &endp);
if (writebdy <= 0)
--
1.7.4.1.22.gec8e1.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
