From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id pA48LnsN079056 for ; Fri, 4 Nov 2011 03:21:50 -0500 Received: from mo-p00-ob.rzone.de (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id B849321F415 for ; Fri, 4 Nov 2011 01:21:42 -0700 (PDT) Received: from mo-p00-ob.rzone.de (mo-p00-ob.rzone.de [81.169.146.162]) by cuda.sgi.com with ESMTP id LLKDYsDTAO1VzhPm for ; Fri, 04 Nov 2011 01:21:42 -0700 (PDT) Message-ID: <4EB3A08C.7010803@giantdisaster.de> Date: Fri, 04 Nov 2011 09:21:32 +0100 From: Stefan Behrens MIME-Version: 1.0 Subject: Re: [PATCH 2/2] xfstests: meet btrfs fs size requirement in _scratch_mkfs_sized() References: <1320374284-1534-1-git-send-email-guaneryu@gmail.com> <1320374284-1534-2-git-send-email-guaneryu@gmail.com> <20111104053908.GB16720@infradead.org> In-Reply-To: List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: guaneryu@gmail.com Cc: Christoph Hellwig , linux-btrfs@vger.kernel.org, xfs@oss.sgi.com On 11/4/2011 7:06 AM, Eryu Guan wrote: > On Fri, Nov 4, 2011 at 1:39 PM, Christoph Hellwig wrote: >> On Fri, Nov 04, 2011 at 10:38:04AM +0800, Eryu Guan wrote: >>> btrfs requires at least 256M file system size, so check 'fssize' in >>> _scratch_mkfs_sized first and give it a proper value. Otherwise >>> mkfs.btrfs will complain something like >>> >>> "File system size 267386880 bytes is too small, 256M is required at least" Commit bd7d6d45 from Zhong, Xin with date 6/21/2011 removed the 256MB size limitation in mkfs.c in btrfs-progs. >>> >>> This makes 015 077 and 083 run on btrfs. >> >> But it's not really going to test the ENOSPC conditions it was designed >> to exercise. It would be better to either find a way to make btrfs run on >> smaller filesystem, or call _notrun for too small filesystems on btrfs >> from _scratch_mkfs_sized. > > Yes, you're right. I checked 015 (it would dd zero to btrfs to full) but forgot > to check 077 and 083. > > I'll try to find a better way. Thanks for reviewing! > > Eryu Guan >> >>> >>> Signed-off-by: Eryu Guan >>> --- >>> common.rc | 5 +++++ >>> 1 files changed, 5 insertions(+), 0 deletions(-) >>> >>> diff --git a/common.rc b/common.rc >>> index e948169..ab61786 100644 >>> --- a/common.rc >>> +++ b/common.rc >>> @@ -356,6 +356,11 @@ _scratch_mkfs_sized() >>> /sbin/mkfs.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks >>> ;; >>> btrfs) >>> + # btrfs needs at least 256M file system size >>> + if [ $fssize -lt $((256*1024*1024)) ] >>> + then >>> + fssize=$((256*1024*1024)) >>> + fi >>> $MKFS_BTRFS_PROG $MKFS_OPTIONS -b $fssize $SCRATCH_DEV >>> ;; >>> *) >>> -- >>> 1.7.7.1 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs