From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 84DD47F3F for ; Mon, 18 Mar 2013 16:36:19 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id 64ECE304051 for ; Mon, 18 Mar 2013 14:36:19 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id 7dvGbovOr8WAt4Jm for ; Mon, 18 Mar 2013 14:36:18 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2ILaI93018147 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Mar 2013 17:36:18 -0400 Received: from bfoster.bfoster (dhcp-189-135.bos.redhat.com [10.16.189.135]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2ILaHO8025572 for ; Mon, 18 Mar 2013 17:36:18 -0400 From: Brian Foster Subject: [PATCH] xfsprogs: reduce bb_numrecs in bno/cnt btrees when log consumes all agf space Date: Mon, 18 Mar 2013 17:38:09 -0400 Message-Id: <1363642689-17718-1-git-send-email-bfoster@redhat.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 Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com The mkfs code currently creates a single free space extent record for each of the bno and cnt btrees in each AG. The start block of the record is pushed forward on the AG that hosts an internal log. If the log happens to consume all available space in the AG, the start block becomes equal to sb->sb_agblocks and thus invalid. This causes xfs_repair to complain. For example, the following sequence: mkfs.xfs -d file,name=./fs.img,size=50g,agsize=16m xfs_repair ./fs.img ... produces the following xfs_repair output: Phase 1 - find and verify superblock... Phase 2 - using internal log - scan filesystem freespace and inode maps... invalid start block 4096 in record 0 of bno btree block 1600/1 invalid start block 4096 in record 0 of cnt btree block 1600/2 - found root inode chunk ... xfs_repair appears to correct the numrecs value such that subsequent checks are successful. The sequence above is pulled from xfstests Modify mkfs.xfs such that we check the block count value of the free space record for the log AG after the log is accounted for. If no space is left for the record, reset the record count to 0. Signed-off-by: Brian Foster --- mkfs/xfs_mkfs.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index c84448e..c4ae15b 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2594,6 +2594,9 @@ an AG size that is one stripe unit smaller, for example %llu.\n"), } arec->ar_blockcount = cpu_to_be32(agsize - be32_to_cpu(arec->ar_startblock)); + if (!arec->ar_blockcount) + block->bb_numrecs = cpu_to_be16(0); + libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE); /* @@ -2627,6 +2630,9 @@ an AG size that is one stripe unit smaller, for example %llu.\n"), } arec->ar_blockcount = cpu_to_be32(agsize - be32_to_cpu(arec->ar_startblock)); + if (!arec->ar_blockcount) + block->bb_numrecs = cpu_to_be16(0); + libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE); /* -- 1.7.7.6 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs