bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-26 14:17:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ext4: update the s_overhead_clusters in the backup sb's when resizing

Browse source 
When the EXT4_IOC_RESIZE_FS ioctl is complete, update the backup
superblocks.  We don't do this for the old-style resize ioctls since
they are quite ancient, and only used by very old versions of
resize2fs --- and we don't want to update the backup superblocks every
time EXT4_IOC_GROUP_ADD is called, since it might get called a lot.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20220629040026.112371-2-tytso@mit.edu
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2022-06-29 00:00:26 -04:00
parent de394a8665
commit 827891a38a
4 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/ext4/ext4.h
View file

@ -3016,7 +3016,7 @@ int ext4_fileattr_set(struct user_namespace *mnt_userns,
struct dentry *dentry, struct fileattr *fa); struct dentry *dentry, struct fileattr *fa);
int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa); int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa);
extern void ext4_reset_inode_seed(struct inode *inode); extern void ext4_reset_inode_seed(struct inode *inode);
int ext4_update_overhead(struct super_block *sb); int ext4_update_overhead(struct super_block *sb, bool force);
/* migrate.c */ /* migrate.c */
extern int ext4_ext_migrate(struct inode *); extern int ext4_ext_migrate(struct inode *);
@ -3800,7 +3800,7 @@ static inline void set_bitmap_uptodate(struct buffer_head *bh)
extern wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ]; extern wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ];
extern int ext4_resize_begin(struct super_block *sb); extern int ext4_resize_begin(struct super_block *sb);
extern void ext4_resize_end(struct super_block *sb); extern int ext4_resize_end(struct super_block *sb, bool update_backups);
static inline void ext4_set_io_unwritten_flag(struct inode *inode, static inline void ext4_set_io_unwritten_flag(struct inode *inode,
struct ext4_io_end *io_end) struct ext4_io_end *io_end)

22
fs/ext4/ioctl.c
View file

@ -944,7 +944,9 @@ static long ext4_ioctl_group_add(struct file *file,
test_opt(sb, INIT_INODE_TABLE)) test_opt(sb, INIT_INODE_TABLE))
err = ext4_register_li_request(sb, input->group); err = ext4_register_li_request(sb, input->group);
group_add_out: group_add_out:
ext4_resize_end(sb); err2 = ext4_resize_end(sb, false);
if (err == 0)
err = err2;
return err; return err;
} }
@ -1223,7 +1225,9 @@ setversion_out:
err = err2; err = err2;
mnt_drop_write_file(filp); mnt_drop_write_file(filp);
group_extend_out: group_extend_out:
ext4_resize_end(sb); err2 = ext4_resize_end(sb, false);
if (err == 0)
err = err2;
return err; return err;
} }
@ -1371,7 +1375,9 @@ mext_out:
err = ext4_register_li_request(sb, o_group); err = ext4_register_li_request(sb, o_group);
resizefs_out: resizefs_out:
ext4_resize_end(sb); err2 = ext4_resize_end(sb, true);
if (err == 0)
err = err2;
return err; return err;
} }
@ -1599,13 +1605,15 @@ static void set_overhead(struct ext4_super_block *es, const void *arg)
es->s_overhead_clusters = cpu_to_le32(*((unsigned long *) arg)); es->s_overhead_clusters = cpu_to_le32(*((unsigned long *) arg));
} }
int ext4_update_overhead(struct super_block *sb) int ext4_update_overhead(struct super_block *sb, bool force)
{ {
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
if (sb_rdonly(sb) || sbi->s_overhead == 0 || if (sb_rdonly(sb))
sbi->s_overhead == le32_to_cpu(sbi->s_es->s_overhead_clusters)) return 0;
if (!force &&
(sbi->s_overhead == 0 ||
sbi->s_overhead == le32_to_cpu(sbi->s_es->s_overhead_clusters)))
return 0; return 0;
return ext4_update_superblocks_fn(sb, set_overhead, &sbi->s_overhead); return ext4_update_superblocks_fn(sb, set_overhead, &sbi->s_overhead);
} }

5
fs/ext4/resize.c
View file

@ -97,10 +97,13 @@ int ext4_resize_begin(struct super_block *sb)
return ret; return ret;
} }
void ext4_resize_end(struct super_block *sb) int ext4_resize_end(struct super_block *sb, bool update_backups)
{ {
clear_bit_unlock(EXT4_FLAGS_RESIZING, &EXT4_SB(sb)->s_ext4_flags); clear_bit_unlock(EXT4_FLAGS_RESIZING, &EXT4_SB(sb)->s_ext4_flags);
smp_mb__after_atomic(); smp_mb__after_atomic();
if (update_backups)
return ext4_update_overhead(sb, true);
return 0;
} }
static ext4_group_t ext4_meta_bg_first_group(struct super_block *sb, static ext4_group_t ext4_meta_bg_first_group(struct super_block *sb,

2
fs/ext4/super.c
View file

@ -5523,7 +5523,7 @@ static int ext4_fill_super(struct super_block *sb, struct fs_context *fc)
"Quota mode: %s.", descr, ext4_quota_mode(sb)); "Quota mode: %s.", descr, ext4_quota_mode(sb));
/* Update the s_overhead_clusters if necessary */ /* Update the s_overhead_clusters if necessary */
ext4_update_overhead(sb); ext4_update_overhead(sb, false);
return 0; return 0;
free_sbi: free_sbi: