From: Boris Ranto <branto@redhat.com>
Date: Wed, 11 May 2011 17:02:24 +0000 (-0500)
Subject: xfstests: fsx: do not print fallocate support warning in quiet mode
X-Git-Tag: v1.1.0~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=630421f6d44920601c39a008bdefa501593162b5;p=xfstests-dev.git

xfstests: fsx: do not print fallocate support warning in quiet mode

ltp/fsx.c tests whether the filesystem it is run on supports fallocate.
If it is not supported the fsx will print warning to stderr. This leads
to fails of tests 075, 112, 127 for the filesystems that do not support
fallocate. The tests use ltp/fsx but do not filter out stderr. Since
ltp/fsx.c can work without fallocate support I propose to move this
message to stdout unless quiet output is not requested. Previous patch
printed the message even if -q flag was used. This patch honours the flag.

This simple patch fixes the issue for me, tested on all the mentioned tests:

Signed-off-by: Boris Ranto <branto@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/ltp/fsx.c b/ltp/fsx.c
index fe072d3a..0eebc70a 100644
--- a/ltp/fsx.c
+++ b/ltp/fsx.c
@@ -1424,7 +1424,8 @@ main(int argc, char **argv)
 #ifdef FALLOCATE
 	if (!lite && fallocate_calls) {
 		if (fallocate(fd, 0, 0, 1) && errno == EOPNOTSUPP) {
-			warn("main: filesystem does not support fallocate, disabling");
+			if(!quiet)
+				prt("fsx: main: filesystem does not support fallocate, disabling\n");
 			fallocate_calls = 0;
 		} else
 			ftruncate(fd, 0);