From patchwork Tue Feb 26 21:03:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Whitney X-Patchwork-Id: 223397 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1C4222C0084 for ; Wed, 27 Feb 2013 08:03:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932155Ab3BZVD2 (ORCPT ); Tue, 26 Feb 2013 16:03:28 -0500 Received: from mail-qa0-f53.google.com ([209.85.216.53]:45763 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759860Ab3BZVD1 (ORCPT ); Tue, 26 Feb 2013 16:03:27 -0500 Received: by mail-qa0-f53.google.com with SMTP id z4so2800420qan.5 for ; Tue, 26 Feb 2013 13:03:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=pbYvaxhaRBHSiXmutH2lc2mQMqLA6fnviWK6ahbnx4M=; b=OG57QcuqrRWInExhm9tuaDkuwpcLDGMJ8WG8g8yazlTNkfxJa16wYvMiaRpwUux6pD DVOVHdds1/SMEmDCejxmiNXK6yHSFPOpskbaaM6yG+cM6+oPEE9n+/GYhbSdC/0Wxode GeZcYKjPMXmL6bWobrZbBghgsW4khk6qDL+WrMxFFX4IMGXqPRShCQcY0Xf6c/HiKmyc yqQ9lzqMyv33oqr0dKkKWswqXzRmrFjCHiIjql41iOWilTVgrI28ScXw/5b3flCjNCkK 96I122sruIAlQeBaKHJHlo8mKqN9vqbSRinVkSJV30X1kYB+extoSwL8jnYVijbumm1q 2Wtg== X-Received: by 10.49.51.5 with SMTP id g5mr18775819qeo.9.1361912606724; Tue, 26 Feb 2013 13:03:26 -0800 (PST) Received: from wallace (c-75-68-62-236.hsd1.nh.comcast.net. [75.68.62.236]) by mx.google.com with ESMTPS id hr3sm3909158qab.4.2013.02.26.13.03.25 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 26 Feb 2013 13:03:25 -0800 (PST) Date: Tue, 26 Feb 2013 16:03:22 -0500 From: Eric Whitney To: xfs@oss.sgi.com Cc: linux-ext4@vger.kernel.org Subject: [PATCH] xfstests: use native definition of O_DIRECT flag Message-ID: <20130226210322.GB5275@wallace> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org The definition of O_DIRECT in src/trunc.c causes xfstest 125 to fail when run on a Pandaboard. On ARM, the value used (0x040000) is O_DIRECTORY rather than O_DIRECT as it is on x86. Prefer the platform's native definition of O_DIRECT supplied by fcntl.h if available. Also, fix a couple of error messages to properly reflect their context. Signed-off-by: Eric Whitney Reviewed-by: Dave Chinner --- src/trunc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/trunc.c b/src/trunc.c index 7539532..38fb21f 100644 --- a/src/trunc.c +++ b/src/trunc.c @@ -26,7 +26,9 @@ #include #include +#ifndef O_DIRECT #define O_DIRECT 040000 +#endif #define WAITTIME 60 #define BUFSIZE 4096 @@ -82,7 +84,7 @@ while((c=getopt(argc,argv,"f:"))!=EOF) { printf("direct write of 1's into file\n"); err = write(fd, buf, BUFSIZE); - if (err < 0) perror("buffered write failed"); + if (err < 0) perror("direct write failed"); close(fd); @@ -96,7 +98,7 @@ while((c=getopt(argc,argv,"f:"))!=EOF) { printf("buffered write of 2's into file\n"); err = write(fd, buf, BUFSIZE); - if (err < 0) perror("direct write failed"); + if (err < 0) perror("buffered write failed"); /* 1 now on disk, but 2 data is buffered */