summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2014-02-19 15:33:05 +1100
committerDave Chinner <david@fromorbit.com>2014-02-19 15:33:05 +1100
commit7a01e707a324a4585949ca3df6c7f7485d8783f2 (patch)
treeb784f7fc887dce702068e0031cc586ea1a19bb27 /fs
parent3895e51f6dbf6610519be070a3bede811f6ac4fb (diff)
downloadblackbird-op-linux-7a01e707a324a4585949ca3df6c7f7485d8783f2.tar.gz
blackbird-op-linux-7a01e707a324a4585949ca3df6c7f7485d8783f2.zip
xfs: xfs_sb_read_verify() doesn't flag bad crcs on primary sb
My earlier commit 10e6e65 deserves a layer or two of brown paper bags. The logic in that commit means that a CRC failure on the primary superblock will *never* result in an error return. Hopefully this fixes it, so that we always return the error if it's a primary superblock, otherwise only if the filesystem has CRCs enabled. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_sb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c
index b7c9aea77f8f..5071ccb67f07 100644
--- a/fs/xfs/xfs_sb.c
+++ b/fs/xfs/xfs_sb.c
@@ -614,7 +614,7 @@ xfs_sb_read_verify(
if (!xfs_verify_cksum(bp->b_addr, be16_to_cpu(dsb->sb_sectsize),
offsetof(struct xfs_sb, sb_crc))) {
/* Only fail bad secondaries on a known V5 filesystem */
- if (bp->b_bn != XFS_SB_DADDR &&
+ if (bp->b_bn == XFS_SB_DADDR ||
xfs_sb_version_hascrc(&mp->m_sb)) {
error = EFSCORRUPTED;
goto out_error;
OpenPOWER on IntegriCloud