From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: Dmitry Monakhov <dmonakhov@openvz.org>,
"Theodore Ts'o" <tytso@mit.edu>,
stable@vger.kernel.org
Subject: [PATCH 2/3] ext4: fix big-endian bug in metadata checksum calculations
Date: Wed, 10 Apr 2013 00:02:27 -0400 [thread overview]
Message-ID: <1365566549-23325-2-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1365566549-23325-1-git-send-email-tytso@mit.edu>
From: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
---
fs/ext4/inode.c | 8 ++++----
fs/ext4/mmp.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 629d67b..62189c8 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -55,21 +55,21 @@ static __u32 ext4_inode_csum(struct inode *inode, struct ext4_inode *raw,
__u16 csum_hi = 0;
__u32 csum;
- csum_lo = raw->i_checksum_lo;
+ csum_lo = le16_to_cpu(raw->i_checksum_lo);
raw->i_checksum_lo = 0;
if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE &&
EXT4_FITS_IN_INODE(raw, ei, i_checksum_hi)) {
- csum_hi = raw->i_checksum_hi;
+ csum_hi = le16_to_cpu(raw->i_checksum_hi);
raw->i_checksum_hi = 0;
}
csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)raw,
EXT4_INODE_SIZE(inode->i_sb));
- raw->i_checksum_lo = csum_lo;
+ raw->i_checksum_lo = cpu_to_le16(csum_lo);
if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE &&
EXT4_FITS_IN_INODE(raw, ei, i_checksum_hi))
- raw->i_checksum_hi = csum_hi;
+ raw->i_checksum_hi = cpu_to_le16(csum_hi);
return csum;
}
diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index f9b5515..b3b1f7d 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -7,7 +7,7 @@
#include "ext4.h"
/* Checksumming functions */
-static __u32 ext4_mmp_csum(struct super_block *sb, struct mmp_struct *mmp)
+static __le32 ext4_mmp_csum(struct super_block *sb, struct mmp_struct *mmp)
{
struct ext4_sb_info *sbi = EXT4_SB(sb);
int offset = offsetof(struct mmp_struct, mmp_checksum);
--
1.7.12.rc0.22.gcdd159b
next prev parent reply other threads:[~2013-04-10 4:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-03 10:58 [PATCH 1/2] ext4: fix usless declarations Dmitry Monakhov
2013-04-03 10:58 ` [PATCH 2/2] ext4: fix cpu_vs_disk conversions Dmitry Monakhov
2013-04-03 12:33 ` Theodore Ts'o
2013-04-03 12:58 ` Dmitry Monakhov
2013-04-03 13:04 ` Zheng Liu
2013-04-03 16:01 ` Theodore Ts'o
2013-04-03 15:37 ` Theodore Ts'o
2013-04-03 15:55 ` Dmitry Monakhov
2013-04-04 14:42 ` Dmitry Monakhov
2013-04-10 4:01 ` Theodore Ts'o
2013-04-10 4:02 ` [PATCH 1/3] ext4: fix big-endian bug in extent migration code Theodore Ts'o
2013-04-10 4:02 ` Theodore Ts'o [this message]
2013-04-10 4:02 ` [PATCH 3/3] ext4: fix miscellaneous big endian warnings Theodore Ts'o
2013-04-03 12:26 ` [PATCH 1/2] ext4: fix usless declarations Theodore Ts'o
2013-04-03 12:31 ` Dmitry Monakhov
2013-04-10 2:50 ` [1/2] " Theodore Ts'o
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=1365566549-23325-2-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=dmonakhov@openvz.org \
--cc=linux-ext4@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).