diff options
| author | Dave Chinner <dchinner@redhat.com> | 2013-09-03 21:47:38 +1000 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-09-10 14:07:54 -0500 |
| commit | 74ffa796e127906883cacedcf3871494192c9e42 (patch) | |
| tree | 8eea128166fde98513d755d378f78c53af0be7fc /fs/xfs | |
| parent | 46f9d2eb37849a328011b182729990d2db3f4d52 (diff) | |
| download | kernel_goldelico_gta04-74ffa796e127906883cacedcf3871494192c9e42.zip kernel_goldelico_gta04-74ffa796e127906883cacedcf3871494192c9e42.tar.gz kernel_goldelico_gta04-74ffa796e127906883cacedcf3871494192c9e42.tar.bz2 | |
xfs: don't assert fail on bad inode numbers
Let the inode verifier do it's work by returning an error when we
fail to find correct magic numbers in an inode buffer.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_inode_buf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/xfs/xfs_inode_buf.c b/fs/xfs/xfs_inode_buf.c index 3d25c9a..63382d3 100644 --- a/fs/xfs/xfs_inode_buf.c +++ b/fs/xfs/xfs_inode_buf.c @@ -53,9 +53,8 @@ xfs_inobp_check( i * mp->m_sb.sb_inodesize); if (!dip->di_next_unlinked) { xfs_alert(mp, - "Detected bogus zero next_unlinked field in incore inode buffer 0x%p.", - bp); - ASSERT(dip->di_next_unlinked); + "Detected bogus zero next_unlinked field in inode %d buffer 0x%llx.", + i, (long long)bp->b_bn); } } } @@ -106,11 +105,10 @@ xfs_inode_buf_verify( XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_HIGH, mp, dip); #ifdef DEBUG - xfs_emerg(mp, + xfs_alert(mp, "bad inode magic/vsn daddr %lld #%d (magic=%x)", (unsigned long long)bp->b_bn, i, be16_to_cpu(dip->di_magic)); - ASSERT(0); #endif } } |