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 0F1457F50 for ; Tue, 16 Sep 2014 10:26:47 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay2.corp.sgi.com (Postfix) with ESMTP id F0D7A304048 for ; Tue, 16 Sep 2014 08:26:46 -0700 (PDT) Received: from sandeen.net (sandeen.net [63.231.237.45]) by cuda.sgi.com with ESMTP id kjOOu2a8Dfw05kQ8 for ; Tue, 16 Sep 2014 08:26:42 -0700 (PDT) Received: from liberator.sandeen.net (liberator.sandeen.net [10.0.0.4]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by sandeen.net (Postfix) with ESMTPSA id B3EB865B096C for ; Tue, 16 Sep 2014 10:26:41 -0500 (CDT) Message-ID: <541856B1.3000009@sandeen.net> Date: Tue, 16 Sep 2014 10:26:41 -0500 From: Eric Sandeen MIME-Version: 1.0 Subject: [PATCH 1/2 V2] xfs_db: fix inode CRC validity state, and warn on read if invalid References: <540B4399.4020804@sandeen.net> In-Reply-To: <540B4399.4020804@sandeen.net> 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 Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs-oss Currently, the "ino_crc_ok" field on the io cursor reflects overall inode validity, not CRC correctness. Because it is only used when printing CRC validity, change it to reflect only that state - and update it whenever we re-write the inode (thus updating the CRC). In addition, when reading an inode, warn if the CRC is bad. Note, when specifying an inode which doesn't actually exist, this will claim corruption; I'm not sure if that's good or bad. Today, it already issues corruption errors on the way; this adds a new message as well: xfs_db> inode 129 Metadata corruption detected at block 0x80/0x2000 Metadata corruption detected at block 0x80/0x2000 ... Metadata CRC error detected for ino 129 Signed-off-by: Eric Sandeen --- V2: fix whitespace damage, introduce libxfs_verify_cksum diff --git a/db/inode.c b/db/inode.c index 24170ba..982acb7 100644 --- a/db/inode.c +++ b/db/inode.c @@ -684,13 +684,18 @@ set_cur_inode( numblks, DB_RING_IGN, NULL); off_cur(offset << mp->m_sb.sb_inodelog, mp->m_sb.sb_inodesize); dip = iocur_top->data; - iocur_top->ino_crc_ok = libxfs_dinode_verify(mp, ino, dip); + iocur_top->ino_crc_ok = libxfs_verify_cksum((char *)dip, + mp->m_sb.sb_inodesize, + XFS_DINODE_CRC_OFF); iocur_top->ino_buf = 1; iocur_top->ino = ino; iocur_top->mode = be16_to_cpu(dip->di_mode); if ((iocur_top->mode & S_IFMT) == S_IFDIR) iocur_top->dirino = ino; + if (xfs_sb_version_hascrc(&mp->m_sb) && !iocur_top->ino_crc_ok) + dbprintf(_("Metadata CRC error detected for ino %lld\n"), ino); + /* track updated info in ring */ ring_add(); } diff --git a/db/io.c b/db/io.c index 7f1b76a..f7393c5 100644 --- a/db/io.c +++ b/db/io.c @@ -464,8 +464,10 @@ write_cur(void) return; } - if (iocur_top->ino_buf) + if (iocur_top->ino_buf) { libxfs_dinode_calc_crc(mp, iocur_top->data); + iocur_top->ino_crc_ok = 1; + } if (iocur_top->dquot_buf) xfs_update_cksum(iocur_top->data, sizeof(struct xfs_dqblk), XFS_DQUOT_CRC_OFF); diff --git a/include/libxfs.h b/include/libxfs.h index 45a924f..962e319 100644 --- a/include/libxfs.h +++ b/include/libxfs.h @@ -782,6 +782,8 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len); #include +#define libxfs_verify_cksum xfs_verify_cksum + static inline int xfs_buf_verify_cksum(struct xfs_buf *bp, unsigned long cksum_offset) { _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs