From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id p680s5K6204474 for ; Thu, 7 Jul 2011 19:54:06 -0500 Received: from ipmail06.adl2.internode.on.net (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id E2D87E8E8BA for ; Thu, 7 Jul 2011 17:54:03 -0700 (PDT) Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by cuda.sgi.com with ESMTP id xsl0cPcCuRvvDYWb for ; Thu, 07 Jul 2011 17:54:03 -0700 (PDT) Received: from chute ([192.168.1.1] helo=disappointment) by dastard with esmtp (Exim 4.72) (envelope-from ) id 1QezKI-0003R7-4s for xfs@oss.sgi.com; Fri, 08 Jul 2011 10:53:50 +1000 Received: from dave by disappointment with local (Exim 4.76) (envelope-from ) id 1QezKH-0007yN-6c for xfs@oss.sgi.com; Fri, 08 Jul 2011 10:53:49 +1000 From: Dave Chinner Subject: [PATCH 1/4] xfstests: fix fsx fpunch test to actually test for fpunch Date: Fri, 8 Jul 2011 10:53:43 +1000 Message-Id: <1310086426-30605-2-git-send-email-david@fromorbit.com> In-Reply-To: <1310086426-30605-1-git-send-email-david@fromorbit.com> References: <1310086426-30605-1-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com From: Dave Chinner The operation flags parameter to fallocate is the second parameter, not the last. Hence the fpunch test is actually testing for falloc support, not fpunch. Somebody needs a brown paper bag. Also, add a ftruncate call whenthe fpunch succeeds just in case the file was not already zero sized. Failing to ensure we start with a zero length file can cause read ops to fail size checks if they occur before the file is written to be the main test loop. While there, observe the quiet flag the same as the falloc test does and have them both emit the warning at the same error level. Signed-off-by: Dave Chinner --- ltp/fsx.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ltp/fsx.c b/ltp/fsx.c index 0683853..a37e223 100644 --- a/ltp/fsx.c +++ b/ltp/fsx.c @@ -1243,7 +1243,7 @@ test_fallocate() if (!lite && fallocate_calls) { if (fallocate(fd, 0, 0, 1) && errno == EOPNOTSUPP) { if(!quiet) - prt("fsx: main: filesystem does not support fallocate, disabling\n"); + warn("main: filesystem does not support fallocate, disabling\n"); fallocate_calls = 0; } else { ftruncate(fd, 0); @@ -1260,13 +1260,13 @@ test_punch_hole() { #ifdef FALLOC_FL_PUNCH_HOLE if (!lite && punch_hole_calls) { - if (fallocate(fd, 0, 0, - FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE) && - errno == EOPNOTSUPP) { - - warn("main: filesystem does not support fallocate punch hole, disabling"); + if (fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, + 0, 1) && errno == EOPNOTSUPP) { + if(!quiet) + warn("main: filesystem does not support fallocate punch hole, disabling"); punch_hole_calls = 0; - } + } else + ftruncate(fd, 0); } #else /* ! PUNCH HOLE */ punch_hole_calls = 0; -- 1.7.5.1 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs