[Top] [All Lists]

[PATCH 1/2] repair: fix v5 sb ino alignment calculation for large blocks

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/2] repair: fix v5 sb ino alignment calculation for large blocksizes
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Thu, 5 Feb 2015 16:50:22 -0500
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1423173023-54866-1-git-send-email-bfoster@xxxxxxxxxx>
References: <1423173023-54866-1-git-send-email-bfoster@xxxxxxxxxx>
xfs_repair validates the superblock inode alignment field against
several possible valid values. On v5 superblocks, the inode alignment
can be scaled up based on the inode size in relation to the minimum
inode size.

If the block size is larger than the default cluster size (consider
large page size arches such as ppc64), the initial alignment value
calculates to zero. If the inode size is large enough such that
sb_inoalignmt is not zero, sb_validate_ino_align() scales the align
value by the factor of inode size increase. If align is zero, however,
we multiply by zero, the subsequent check incorrectly fails and the
overall superblock verification fails as well. To reproduce, format an
fs as follows on ppc64 and run xfs_repair:

        mkfs.xfs -f -m crc=1 -b size=64k -i size=2k <dev>

Fix the scaled alignment calculation by scaling the default cluster size
appropriately to avoid a multiplication by zero.

Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
 repair/sb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/repair/sb.c b/repair/sb.c
index ad27756..2805fbd 100644
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -196,7 +196,8 @@ sb_validate_ino_align(struct xfs_sb *sb)
        if (!xfs_sb_version_hascrc(sb))
                return false;
-       align *= sb->sb_inodesize / XFS_DINODE_MIN_SIZE;
+       align = (XFS_INODE_BIG_CLUSTER_SIZE *
+                sb->sb_inodesize / XFS_DINODE_MIN_SIZE) >> sb->sb_blocklog;
        if (align == sb->sb_inoalignmt)
                return true;

<Prev in Thread] Current Thread [Next in Thread>