diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/xattr.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index e56c9ed7d6e..2cdb98d6298 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c | |||
@@ -127,19 +127,16 @@ static __le32 ext4_xattr_block_csum(struct inode *inode, | |||
127 | struct ext4_xattr_header *hdr) | 127 | struct ext4_xattr_header *hdr) |
128 | { | 128 | { |
129 | struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); | 129 | struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); |
130 | struct ext4_inode_info *ei = EXT4_I(inode); | ||
131 | __u32 csum, old; | 130 | __u32 csum, old; |
132 | 131 | ||
133 | old = hdr->h_checksum; | 132 | old = hdr->h_checksum; |
134 | hdr->h_checksum = 0; | 133 | hdr->h_checksum = 0; |
135 | if (le32_to_cpu(hdr->h_refcount) != 1) { | 134 | block_nr = cpu_to_le64(block_nr); |
136 | block_nr = cpu_to_le64(block_nr); | 135 | csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&block_nr, |
137 | csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&block_nr, | 136 | sizeof(block_nr)); |
138 | sizeof(block_nr)); | ||
139 | } else | ||
140 | csum = ei->i_csum_seed; | ||
141 | csum = ext4_chksum(sbi, csum, (__u8 *)hdr, | 137 | csum = ext4_chksum(sbi, csum, (__u8 *)hdr, |
142 | EXT4_BLOCK_SIZE(inode->i_sb)); | 138 | EXT4_BLOCK_SIZE(inode->i_sb)); |
139 | |||
143 | hdr->h_checksum = old; | 140 | hdr->h_checksum = old; |
144 | return cpu_to_le32(csum); | 141 | return cpu_to_le32(csum); |
145 | } | 142 | } |