From: Eric Sandeen Date: Tue, 7 Apr 2015 00:04:11 +0000 (+1000) Subject: xfs_repair: validate & fix inode CRCs X-Git-Tag: v3.2.3-rc1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d7c5553e3fdf8d65537037603372869ca19d5eb;p=thirdparty%2Fxfsprogs-dev.git xfs_repair: validate & fix inode CRCs xfs_repair doesn't ever check an inode's CRC, so it never repairs them. If the root inode or realtime inodes have bad crcs, the fs won't even mount and can't be fixed (without using xfs_db). It's fairly straightforward to just test the inode CRC before we do any other checking or modification of the inode, and just mark it dirty if it's wrong and needs to be re-written. Signed-off-by: Eric Sandeen Reviewed-by: Brian Foster Signed-off-by: Dave Chinner --- diff --git a/repair/dinode.c b/repair/dinode.c index 5d9094b3d..035212cfe 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -2291,6 +2291,30 @@ process_dinode_int(xfs_mount_t *mp, */ ASSERT(uncertain == 0 || verify_mode != 0); + /* + * This is the only valid point to check the CRC; after this we may have + * made changes which invalidate it, and the CRC is only updated again + * when it gets written out. + * + * Of course if we make any modifications after this, the inode gets + * rewritten, and the CRC is updated automagically. + */ + if (xfs_sb_version_hascrc(&mp->m_sb) && + !xfs_verify_cksum((char *)dino, mp->m_sb.sb_inodesize, + XFS_DINODE_CRC_OFF)) { + retval = 1; + if (!uncertain) + do_warn(_("bad CRC for inode %" PRIu64 "%c"), + lino, verify_mode ? '\n' : ','); + if (!verify_mode) { + if (!no_modify) { + do_warn(_(" will rewrite\n")); + *dirty = 1; + } else + do_warn(_(" would rewrite\n")); + } + } + if (be16_to_cpu(dino->di_magic) != XFS_DINODE_MAGIC) { retval = 1; if (!uncertain)