diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-21 19:55:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-21 19:55:38 -0400 |
| commit | ea5583b90f9c162af6f2025718dc50ffbb6e4552 (patch) | |
| tree | 91f01f0434711bb9c31a311c0ba0e876c9627a8f /fs/ext4/ext4_common.c | |
| parent | e50f66e364be80e02dd0834b84b830f3aade82ea (diff) | |
| parent | 151a030063898e5c8b03b40c3a96b073db0b0dc7 (diff) | |
Merge branch '2022-04-21-further-cleanups'
- Fix SPL_SYS_MALLOC_SIMPLE and non-SPL_FRAMEWORK boards (a large number
of PowerPC platforms)
- Remove duplication of crc16 functionality
- Migrate COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY and have it in
Kconfig
Diffstat (limited to 'fs/ext4/ext4_common.c')
| -rw-r--r-- | fs/ext4/ext4_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index c52cc400e1..d49ba4a995 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -427,14 +427,14 @@ uint16_t ext4fs_checksum_update(uint32_t i) if (le32_to_cpu(fs->sb->feature_ro_compat) & EXT4_FEATURE_RO_COMPAT_GDT_CSUM) { int offset = offsetof(struct ext2_block_group, bg_checksum); - crc = ext2fs_crc16(~0, fs->sb->unique_id, + crc = crc16(~0, (__u8 *)fs->sb->unique_id, sizeof(fs->sb->unique_id)); - crc = ext2fs_crc16(crc, &le32_i, sizeof(le32_i)); - crc = ext2fs_crc16(crc, desc, offset); + crc = crc16(crc, (__u8 *)&le32_i, sizeof(le32_i)); + crc = crc16(crc, (__u8 *)desc, offset); offset += sizeof(desc->bg_checksum); /* skip checksum */ assert(offset == sizeof(*desc)); if (offset < fs->gdsize) { - crc = ext2fs_crc16(crc, (__u8 *)desc + offset, + crc = crc16(crc, (__u8 *)desc + offset, fs->gdsize - offset); } } |