ext4: remove sbi argument from ext4_chksum()

+4 -4

fs/ext4/bitmap.c

··· 30 30 31 31 sz = EXT4_INODES_PER_GROUP(sb) >> 3; 32 32 provided = le16_to_cpu(gdp->bg_inode_bitmap_csum_lo); 33 - calculated = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 33 + calculated = ext4_chksum(sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 34 34 if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) { 35 35 hi = le16_to_cpu(gdp->bg_inode_bitmap_csum_hi); 36 36 provided |= (hi << 16); ··· 52 52 return; 53 53 54 54 sz = EXT4_INODES_PER_GROUP(sb) >> 3; 55 - csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 55 + csum = ext4_chksum(sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 56 56 gdp->bg_inode_bitmap_csum_lo = cpu_to_le16(csum & 0xFFFF); 57 57 if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) 58 58 gdp->bg_inode_bitmap_csum_hi = cpu_to_le16(csum >> 16); ··· 71 71 return 1; 72 72 73 73 provided = le16_to_cpu(gdp->bg_block_bitmap_csum_lo); 74 - calculated = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 74 + calculated = ext4_chksum(sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 75 75 if (sbi->s_desc_size >= EXT4_BG_BLOCK_BITMAP_CSUM_HI_END) { 76 76 hi = le16_to_cpu(gdp->bg_block_bitmap_csum_hi); 77 77 provided |= (hi << 16); ··· 92 92 if (!ext4_has_feature_metadata_csum(sb)) 93 93 return; 94 94 95 - csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 95 + csum = ext4_chksum(sbi->s_csum_seed, (__u8 *)bh->b_data, sz); 96 96 gdp->bg_block_bitmap_csum_lo = cpu_to_le16(csum & 0xFFFF); 97 97 if (sbi->s_desc_size >= EXT4_BG_BLOCK_BITMAP_CSUM_HI_END) 98 98 gdp->bg_block_bitmap_csum_hi = cpu_to_le16(csum >> 16);

+1 -2

fs/ext4/ext4.h

··· 2494 2494 #define DX_HASH_SIPHASH 6 2495 2495 #define DX_HASH_LAST DX_HASH_SIPHASH 2496 2496 2497 - static inline u32 ext4_chksum(struct ext4_sb_info *sbi, u32 crc, 2498 - const void *address, unsigned int length) 2497 + static inline u32 ext4_chksum(u32 crc, const void *address, unsigned int length) 2499 2498 { 2500 2499 return crc32c(crc, address, length); 2501 2500 }

+1 -2

fs/ext4/extents.c

··· 50 50 struct ext4_extent_header *eh) 51 51 { 52 52 struct ext4_inode_info *ei = EXT4_I(inode); 53 - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); 54 53 __u32 csum; 55 54 56 - csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)eh, 55 + csum = ext4_chksum(ei->i_csum_seed, (__u8 *)eh, 57 56 EXT4_EXTENT_TAIL_OFFSET(eh)); 58 57 return cpu_to_le32(csum); 59 58 }

+5 -5

fs/ext4/fast_commit.c

··· 734 734 tl.fc_len = cpu_to_le16(remaining); 735 735 memcpy(dst, &tl, EXT4_FC_TAG_BASE_LEN); 736 736 memset(dst + EXT4_FC_TAG_BASE_LEN, 0, remaining); 737 - *crc = ext4_chksum(sbi, *crc, sbi->s_fc_bh->b_data, bsize); 737 + *crc = ext4_chksum(*crc, sbi->s_fc_bh->b_data, bsize); 738 738 739 739 ext4_fc_submit_bh(sb, false); 740 740 ··· 781 781 tail.fc_tid = cpu_to_le32(sbi->s_journal->j_running_transaction->t_tid); 782 782 memcpy(dst, &tail.fc_tid, sizeof(tail.fc_tid)); 783 783 dst += sizeof(tail.fc_tid); 784 - crc = ext4_chksum(sbi, crc, sbi->s_fc_bh->b_data, 784 + crc = ext4_chksum(crc, sbi->s_fc_bh->b_data, 785 785 dst - (u8 *)sbi->s_fc_bh->b_data); 786 786 tail.fc_crc = cpu_to_le32(crc); 787 787 memcpy(dst, &tail.fc_crc, sizeof(tail.fc_crc)); ··· 2133 2133 case EXT4_FC_TAG_INODE: 2134 2134 case EXT4_FC_TAG_PAD: 2135 2135 state->fc_cur_tag++; 2136 - state->fc_crc = ext4_chksum(sbi, state->fc_crc, cur, 2136 + state->fc_crc = ext4_chksum(state->fc_crc, cur, 2137 2137 EXT4_FC_TAG_BASE_LEN + tl.fc_len); 2138 2138 break; 2139 2139 case EXT4_FC_TAG_TAIL: 2140 2140 state->fc_cur_tag++; 2141 2141 memcpy(&tail, val, sizeof(tail)); 2142 - state->fc_crc = ext4_chksum(sbi, state->fc_crc, cur, 2142 + state->fc_crc = ext4_chksum(state->fc_crc, cur, 2143 2143 EXT4_FC_TAG_BASE_LEN + 2144 2144 offsetof(struct ext4_fc_tail, 2145 2145 fc_crc)); ··· 2166 2166 break; 2167 2167 } 2168 2168 state->fc_cur_tag++; 2169 - state->fc_crc = ext4_chksum(sbi, state->fc_crc, cur, 2169 + state->fc_crc = ext4_chksum(state->fc_crc, cur, 2170 2170 EXT4_FC_TAG_BASE_LEN + tl.fc_len); 2171 2171 break; 2172 2172 default:

+2 -3

fs/ext4/ialloc.c

··· 1288 1288 __u32 csum; 1289 1289 __le32 inum = cpu_to_le32(inode->i_ino); 1290 1290 __le32 gen = cpu_to_le32(inode->i_generation); 1291 - csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum, 1291 + csum = ext4_chksum(sbi->s_csum_seed, (__u8 *)&inum, 1292 1292 sizeof(inum)); 1293 - ei->i_csum_seed = ext4_chksum(sbi, csum, (__u8 *)&gen, 1294 - sizeof(gen)); 1293 + ei->i_csum_seed = ext4_chksum(csum, (__u8 *)&gen, sizeof(gen)); 1295 1294 } 1296 1295 1297 1296 ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */

+8 -11

fs/ext4/inode.c

··· 58 58 static __u32 ext4_inode_csum(struct inode *inode, struct ext4_inode *raw, 59 59 struct ext4_inode_info *ei) 60 60 { 61 - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); 62 61 __u32 csum; 63 62 __u16 dummy_csum = 0; 64 63 int offset = offsetof(struct ext4_inode, i_checksum_lo); 65 64 unsigned int csum_size = sizeof(dummy_csum); 66 65 67 - csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)raw, offset); 68 - csum = ext4_chksum(sbi, csum, (__u8 *)&dummy_csum, csum_size); 66 + csum = ext4_chksum(ei->i_csum_seed, (__u8 *)raw, offset); 67 + csum = ext4_chksum(csum, (__u8 *)&dummy_csum, csum_size); 69 68 offset += csum_size; 70 - csum = ext4_chksum(sbi, csum, (__u8 *)raw + offset, 69 + csum = ext4_chksum(csum, (__u8 *)raw + offset, 71 70 EXT4_GOOD_OLD_INODE_SIZE - offset); 72 71 73 72 if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE) { 74 73 offset = offsetof(struct ext4_inode, i_checksum_hi); 75 - csum = ext4_chksum(sbi, csum, (__u8 *)raw + 76 - EXT4_GOOD_OLD_INODE_SIZE, 74 + csum = ext4_chksum(csum, (__u8 *)raw + EXT4_GOOD_OLD_INODE_SIZE, 77 75 offset - EXT4_GOOD_OLD_INODE_SIZE); 78 76 if (EXT4_FITS_IN_INODE(raw, ei, i_checksum_hi)) { 79 - csum = ext4_chksum(sbi, csum, (__u8 *)&dummy_csum, 77 + csum = ext4_chksum(csum, (__u8 *)&dummy_csum, 80 78 csum_size); 81 79 offset += csum_size; 82 80 } 83 - csum = ext4_chksum(sbi, csum, (__u8 *)raw + offset, 81 + csum = ext4_chksum(csum, (__u8 *)raw + offset, 84 82 EXT4_INODE_SIZE(inode->i_sb) - offset); 85 83 } 86 84 ··· 4920 4922 __u32 csum; 4921 4923 __le32 inum = cpu_to_le32(inode->i_ino); 4922 4924 __le32 gen = raw_inode->i_generation; 4923 - csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum, 4925 + csum = ext4_chksum(sbi->s_csum_seed, (__u8 *)&inum, 4924 4926 sizeof(inum)); 4925 - ei->i_csum_seed = ext4_chksum(sbi, csum, (__u8 *)&gen, 4926 - sizeof(gen)); 4927 + ei->i_csum_seed = ext4_chksum(csum, (__u8 *)&gen, sizeof(gen)); 4927 4928 } 4928 4929 4929 4930 if ((!ext4_inode_csum_verify(inode, raw_inode, ei) ||

+2 -2

fs/ext4/ioctl.c

··· 354 354 if (!ext4_has_feature_metadata_csum(inode->i_sb)) 355 355 return; 356 356 357 - csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum, sizeof(inum)); 358 - ei->i_csum_seed = ext4_chksum(sbi, csum, (__u8 *)&gen, sizeof(gen)); 357 + csum = ext4_chksum(sbi->s_csum_seed, (__u8 *)&inum, sizeof(inum)); 358 + ei->i_csum_seed = ext4_chksum(csum, (__u8 *)&gen, sizeof(gen)); 359 359 } 360 360 361 361 /*

+1 -1

fs/ext4/mmp.c

··· 14 14 int offset = offsetof(struct mmp_struct, mmp_checksum); 15 15 __u32 csum; 16 16 17 - csum = ext4_chksum(sbi, sbi->s_csum_seed, (char *)mmp, offset); 17 + csum = ext4_chksum(sbi->s_csum_seed, (char *)mmp, offset); 18 18 19 19 return cpu_to_le32(csum); 20 20 }

+4 -6

fs/ext4/namei.c

··· 346 346 347 347 static __le32 ext4_dirblock_csum(struct inode *inode, void *dirent, int size) 348 348 { 349 - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); 350 349 struct ext4_inode_info *ei = EXT4_I(inode); 351 350 __u32 csum; 352 351 353 - csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)dirent, size); 352 + csum = ext4_chksum(ei->i_csum_seed, (__u8 *)dirent, size); 354 353 return cpu_to_le32(csum); 355 354 } 356 355 ··· 441 442 static __le32 ext4_dx_csum(struct inode *inode, struct ext4_dir_entry *dirent, 442 443 int count_offset, int count, struct dx_tail *t) 443 444 { 444 - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); 445 445 struct ext4_inode_info *ei = EXT4_I(inode); 446 446 __u32 csum; 447 447 int size; ··· 448 450 int offset = offsetof(struct dx_tail, dt_checksum); 449 451 450 452 size = count_offset + (count * sizeof(struct dx_entry)); 451 - csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)dirent, size); 452 - csum = ext4_chksum(sbi, csum, (__u8 *)t, offset); 453 - csum = ext4_chksum(sbi, csum, (__u8 *)&dummy_csum, sizeof(dummy_csum)); 453 + csum = ext4_chksum(ei->i_csum_seed, (__u8 *)dirent, size); 454 + csum = ext4_chksum(csum, (__u8 *)t, offset); 455 + csum = ext4_chksum(csum, (__u8 *)&dummy_csum, sizeof(dummy_csum)); 454 456 455 457 return cpu_to_le32(csum); 456 458 }

+6 -7

fs/ext4/orphan.c

··· 541 541 return 1; 542 542 543 543 ot = ext4_orphan_block_tail(sb, bh); 544 - calculated = ext4_chksum(EXT4_SB(sb), oi->of_csum_seed, 545 - (__u8 *)&dsk_block_nr, sizeof(dsk_block_nr)); 546 - calculated = ext4_chksum(EXT4_SB(sb), calculated, (__u8 *)bh->b_data, 544 + calculated = ext4_chksum(oi->of_csum_seed, (__u8 *)&dsk_block_nr, 545 + sizeof(dsk_block_nr)); 546 + calculated = ext4_chksum(calculated, (__u8 *)bh->b_data, 547 547 inodes_per_ob * sizeof(__u32)); 548 548 return le32_to_cpu(ot->ob_checksum) == calculated; 549 549 } ··· 560 560 struct ext4_orphan_block_tail *ot; 561 561 __le64 dsk_block_nr = cpu_to_le64(bh->b_blocknr); 562 562 563 - csum = ext4_chksum(EXT4_SB(sb), oi->of_csum_seed, 564 - (__u8 *)&dsk_block_nr, sizeof(dsk_block_nr)); 565 - csum = ext4_chksum(EXT4_SB(sb), csum, (__u8 *)data, 566 - inodes_per_ob * sizeof(__u32)); 563 + csum = ext4_chksum(oi->of_csum_seed, (__u8 *)&dsk_block_nr, 564 + sizeof(dsk_block_nr)); 565 + csum = ext4_chksum(csum, (__u8 *)data, inodes_per_ob * sizeof(__u32)); 567 566 ot = ext4_orphan_block_tail(sb, bh); 568 567 ot->ob_checksum = cpu_to_le32(csum); 569 568 }

+6 -7

fs/ext4/super.c

··· 289 289 __le32 ext4_superblock_csum(struct super_block *sb, 290 290 struct ext4_super_block *es) 291 291 { 292 - struct ext4_sb_info *sbi = EXT4_SB(sb); 293 292 int offset = offsetof(struct ext4_super_block, s_checksum); 294 293 __u32 csum; 295 294 296 - csum = ext4_chksum(sbi, ~0, (char *)es, offset); 295 + csum = ext4_chksum(~0, (char *)es, offset); 297 296 298 297 return cpu_to_le32(csum); 299 298 } ··· 3205 3206 __u32 csum32; 3206 3207 __u16 dummy_csum = 0; 3207 3208 3208 - csum32 = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&le_group, 3209 + csum32 = ext4_chksum(sbi->s_csum_seed, (__u8 *)&le_group, 3209 3210 sizeof(le_group)); 3210 - csum32 = ext4_chksum(sbi, csum32, (__u8 *)gdp, offset); 3211 - csum32 = ext4_chksum(sbi, csum32, (__u8 *)&dummy_csum, 3211 + csum32 = ext4_chksum(csum32, (__u8 *)gdp, offset); 3212 + csum32 = ext4_chksum(csum32, (__u8 *)&dummy_csum, 3212 3213 sizeof(dummy_csum)); 3213 3214 offset += sizeof(dummy_csum); 3214 3215 if (offset < sbi->s_desc_size) 3215 - csum32 = ext4_chksum(sbi, csum32, (__u8 *)gdp + offset, 3216 + csum32 = ext4_chksum(csum32, (__u8 *)gdp + offset, 3216 3217 sbi->s_desc_size - offset); 3217 3218 3218 3219 crc = csum32 & 0xFFFF; ··· 4640 4641 sbi->s_csum_seed = le32_to_cpu(es->s_checksum_seed); 4641 4642 else if (ext4_has_feature_metadata_csum(sb) || 4642 4643 ext4_has_feature_ea_inode(sb)) 4643 - sbi->s_csum_seed = ext4_chksum(sbi, ~0, es->s_uuid, 4644 + sbi->s_csum_seed = ext4_chksum(~0, es->s_uuid, 4644 4645 sizeof(es->s_uuid)); 4645 4646 return 0; 4646 4647 }

+5 -5

fs/ext4/xattr.c

··· 139 139 __u32 dummy_csum = 0; 140 140 int offset = offsetof(struct ext4_xattr_header, h_checksum); 141 141 142 - csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&dsk_block_nr, 142 + csum = ext4_chksum(sbi->s_csum_seed, (__u8 *)&dsk_block_nr, 143 143 sizeof(dsk_block_nr)); 144 - csum = ext4_chksum(sbi, csum, (__u8 *)hdr, offset); 145 - csum = ext4_chksum(sbi, csum, (__u8 *)&dummy_csum, sizeof(dummy_csum)); 144 + csum = ext4_chksum(csum, (__u8 *)hdr, offset); 145 + csum = ext4_chksum(csum, (__u8 *)&dummy_csum, sizeof(dummy_csum)); 146 146 offset += sizeof(dummy_csum); 147 - csum = ext4_chksum(sbi, csum, (__u8 *)hdr + offset, 147 + csum = ext4_chksum(csum, (__u8 *)hdr + offset, 148 148 EXT4_BLOCK_SIZE(inode->i_sb) - offset); 149 149 150 150 return cpu_to_le32(csum); ··· 348 348 static u32 349 349 ext4_xattr_inode_hash(struct ext4_sb_info *sbi, const void *buffer, size_t size) 350 350 { 351 - return ext4_chksum(sbi, sbi->s_csum_seed, buffer, size); 351 + return ext4_chksum(sbi->s_csum_seed, buffer, size); 352 352 } 353 353 354 354 static u64 ext4_xattr_inode_get_ref(struct inode *ea_inode)