ext4: update the backup superblock's at the end of the online resize
When expanding a file system using online resize, various fields in the superblock (e.g., s_blocks_count, s_inodes_count, etc.) change. To update the backup superblocks, the online resize uses the function update_backups() in fs/ext4/resize.c. This function was not updating the checksum field in the backup superblocks. This wasn't a big deal previously, because e2fsck didn't care about the checksum field in the backup superblock. (And indeed, update_backups() goes all the way back to the ext3 days, well before we had support for metadata checksums.) However, there is an alternate, more general way of updating superblock fields, ext4_update_primary_sb() in fs/ext4/ioctl.c. This function does check the checksum of the backup superblock, and if it doesn't match will mark the file system as corrupted. That was clearly not the intent, so avoid to aborting the resize when a bad superblock is found. In addition, teach update_backups() to properly update the checksum in the backup superblocks. We will eventually want to unify updapte_backups() with the infrasture in ext4_update_primary_sb(), but that's for another day. Note: The problem has been around for a while; it just didn't really matter until ext4_update_primary_sb() was added by commitbbc605cdb1
("ext4: implement support for get/set fs label"). And it became trivially easy to reproduce after commit827891a38a
("ext4: update the s_overhead_clusters in the backup sb's when resizing") in v6.0. Cc: stable@kernel.org # 5.17+ Fixes:bbc605cdb1
("ext4: implement support for get/set fs label") Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Родитель
4c86114194
Коммит
9a8c5b0d06
|
@ -145,9 +145,8 @@ static int ext4_update_backup_sb(struct super_block *sb,
|
|||
if (ext4_has_metadata_csum(sb) &&
|
||||
es->s_checksum != ext4_superblock_csum(sb, es)) {
|
||||
ext4_msg(sb, KERN_ERR, "Invalid checksum for backup "
|
||||
"superblock %llu\n", sb_block);
|
||||
"superblock %llu", sb_block);
|
||||
unlock_buffer(bh);
|
||||
err = -EFSBADCRC;
|
||||
goto out_bh;
|
||||
}
|
||||
func(es, arg);
|
||||
|
|
|
@ -1158,6 +1158,7 @@ static void update_backups(struct super_block *sb, sector_t blk_off, char *data,
|
|||
while (group < sbi->s_groups_count) {
|
||||
struct buffer_head *bh;
|
||||
ext4_fsblk_t backup_block;
|
||||
struct ext4_super_block *es;
|
||||
|
||||
/* Out of journal space, and can't get more - abort - so sad */
|
||||
err = ext4_resize_ensure_credits_batch(handle, 1);
|
||||
|
@ -1186,6 +1187,10 @@ static void update_backups(struct super_block *sb, sector_t blk_off, char *data,
|
|||
memcpy(bh->b_data, data, size);
|
||||
if (rest)
|
||||
memset(bh->b_data + size, 0, rest);
|
||||
es = (struct ext4_super_block *) bh->b_data;
|
||||
es->s_block_group_nr = cpu_to_le16(group);
|
||||
if (ext4_has_metadata_csum(sb))
|
||||
es->s_checksum = ext4_superblock_csum(sb, es);
|
||||
set_buffer_uptodate(bh);
|
||||
unlock_buffer(bh);
|
||||
err = ext4_handle_dirty_metadata(handle, NULL, bh);
|
||||
|
|
Загрузка…
Ссылка в новой задаче