From patchwork Wed Jan 29 20:45:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Whitney X-Patchwork-Id: 315216 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 ACEB12C00D1 for ; Thu, 30 Jan 2014 07:45:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752169AbaA2UpJ (ORCPT ); Wed, 29 Jan 2014 15:45:09 -0500 Received: from mail-qc0-f173.google.com ([209.85.216.173]:49119 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751166AbaA2UpI (ORCPT ); Wed, 29 Jan 2014 15:45:08 -0500 Received: by mail-qc0-f173.google.com with SMTP id i8so3591353qcq.18 for ; Wed, 29 Jan 2014 12:45:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=Csf+AJgJA4L/kHop2bscmesVyc0yEih5ggpiRmjYcyA=; b=xYH0i4gydqWKutTVFtsKd8ftpl8ETPqt8YqNCNOktPwt3eRawbjS1tGjOSskdMaFhf H0d6ZI1iAIJYtSsX3xfFta7YSuUTLHYxceLx4q8XvmGQH1ogWP1v+FC+LOEU+7AR6pik IPOkKSHwXTSmgmL2buAF6qM4MwdhLPZ61A3miCuLAQgqiY9voss6Ay0NjDX1Phzz6+ou 0UDpRnr9sAoSqQm+L01REZxIHIvYqOhfALHXf+sr+b936RmIiIQDQnNix/WbIZZS/yu2 yYC1njTL09ShDDyPoG8/qpUqI9N9Tv0vUoXQzmiyzADUcCmbG57sr4q6xtqv5T1tvdXQ BoJA== X-Received: by 10.224.147.75 with SMTP id k11mr15667712qav.22.1391028306109; Wed, 29 Jan 2014 12:45:06 -0800 (PST) Received: from wallace (c-75-67-250-69.hsd1.nh.comcast.net. [75.67.250.69]) by mx.google.com with ESMTPSA id b4sm5121700qgf.16.2014.01.29.12.45.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 12:45:05 -0800 (PST) Date: Wed, 29 Jan 2014 15:45:02 -0500 From: Eric Whitney To: xfs@oss.sgi.com Cc: linux-ext4@vger.kernel.org Subject: [PATCH] xfstests: avoid ext4/306 failures caused by incompatible mount options Message-ID: <20140129204502.GC2165@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 ext4/306 will fail when mounting the ext3 file system it creates if an ext3-incompatible mount option is applied by _scratch_mount. This can happen if EXT_MOUNT_OPTIONS is defined appropriately in the test environment. For example, the block_validity option is commonly used to enhance ext4 testing, and it is not supported by ext3. Fix this by not including any mount options defined by the test environment. Signed-off-by: Eric Whitney --- tests/ext4/306 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/ext4/306 b/tests/ext4/306 index 398c4c0..e59c8ed 100755 --- a/tests/ext4/306 +++ b/tests/ext4/306 @@ -52,9 +52,10 @@ grep -q ext3 /proc/filesystems || _notrun "This test requires ext3 support" rm -f $seqres.full -# Make a small ext3 fs, (extents disabled) & mount it +# Make a small ext3 fs, (extents disabled) yes | mkfs.ext3 $SCRATCH_DEV 512m >> $seqres.full 2>&1 -_scratch_mount -t ext3 || _fail "couldn't mount fs as ext3" +# Mount it without _scratch_mount to avoid any ext3-incompatible mount options +_mount -t ext3 $SCRATCH_DEV $SCRATCH_MNT || _fail "couldn't mount fs as ext3" # Create a small non-extent-based file echo "Create 1m testfile1" $XFS_IO_PROG -f $SCRATCH_MNT/testfile1 -c "pwrite 0 1m" | _filter_xfs_io