From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 4/4] xfs: fix da node magic number mismatches
Date: Tue, 30 Apr 2013 21:39:36 +1000 [thread overview]
Message-ID: <1367321976-18268-5-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1367321976-18268-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_da_btree.c | 2 +-
fs/xfs/xfs_log_recover.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index 56814e3..9b26a99 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/fs/xfs/xfs_da_btree.c
@@ -310,8 +310,8 @@ xfs_da3_node_read(
int type;
switch (be16_to_cpu(info->magic)) {
- case XFS_DA3_NODE_MAGIC:
case XFS_DA_NODE_MAGIC:
+ case XFS_DA3_NODE_MAGIC:
type = XFS_BLFT_DA_NODE_BUF;
break;
case XFS_ATTR_LEAF_MAGIC:
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index ecaa4d4..93f03ec 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2039,7 +2039,7 @@ xlog_recovery_validate_buf_type(
case XFS_BLFT_ATTR_RMT_BUF:
if (!xfs_sb_version_hascrc(&mp->m_sb))
break;
- if (magicda != XFS_ATTR3_RMT_MAGIC) {
+ if (magic32 != XFS_ATTR3_RMT_MAGIC) {
xfs_warn(mp, "Bad attr remote magic!");
ASSERT(0);
break;
@@ -2135,7 +2135,6 @@ xlog_recover_do_reg_buffer(
ASSERT(i == item->ri_total);
xlog_recovery_validate_buf_type(mp, bp, buf_f);
-
}
/*
--
1.7.10.4
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-04-30 11:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 11:39 [PATCH 0/4] xfs: fixes for 3.10 merge window Dave Chinner
2013-04-30 11:39 ` [PATCH 1/4] xfs: Teach dquot recovery about CONFIG_XFS_QUOTA Dave Chinner
2013-04-30 18:22 ` Ben Myers
2013-04-30 11:39 ` [PATCH 2/4] xfs: introduce CONFIG_XFS_WARN Dave Chinner
2013-05-08 0:02 ` Ben Myers
2013-04-30 11:39 ` [PATCH 3/4] xfs: Remote attr validation fixes and optimisations Dave Chinner
2013-04-30 21:31 ` Ben Myers
2013-04-30 22:16 ` Dave Chinner
2013-04-30 11:39 ` Dave Chinner [this message]
2013-04-30 21:33 ` [PATCH 4/4] xfs: fix da node magic number mismatches Ben Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367321976-18268-5-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox