xfsprogs: reduce bb_numrecs in bno/cnt btrees when log consumes all agf space

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
test #250, which fails due to this behavior.

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 <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index c84448ecbe16a68993182bc774f938d333af31e4..c57a85582a4d739cf1bcb580ab37ea98afe9a922 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2592,8 +2592,17 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
                         */
                        be32_add_cpu(&arec->ar_startblock, logblocks);
                }
+               /*
+                * Calculate the record block count and check for the case where
+                * the log might have consumed all available space in the AG. If
+                * so, reset the record count to 0 to avoid exposure of an invalid
+                * record start block.
+                */
                arec->ar_blockcount = cpu_to_be32(agsize - 
                                        be32_to_cpu(arec->ar_startblock));
+               if (!arec->ar_blockcount)
+                       block->bb_numrecs = 0;
+
                libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
 
                /*
@@ -2625,8 +2634,17 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
                        }
                        be32_add_cpu(&arec->ar_startblock, logblocks);
                }
+               /*
+                * Calculate the record block count and check for the case where
+                * the log might have consumed all available space in the AG. If
+                * so, reset the record count to 0 to avoid exposure of an invalid
+                * record start block.
+                */
                arec->ar_blockcount = cpu_to_be32(agsize - 
                                        be32_to_cpu(arec->ar_startblock));
+               if (!arec->ar_blockcount)
+                       block->bb_numrecs = 0;
+
                libxfs_writebuf(buf, LIBXFS_EXIT_ON_FAILURE);
 
                /*