| Message ID | 20190822082617.19180-3-dongyangli@ddn.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/4] libext2fs: optimize ext2fs_convert_subcluster_bitmap() | expand |
On Aug 22, 2019, at 2:26 AM, Dongyang Li <dongyangli@ddn.com> wrote: > > Rename s_overhead_blocks field from struct ext2_super_block to > make it consistent with the kernel counterpart. > > Signed-off-by: Li Dongyang <dongyangli@ddn.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> with one minor comment/question below... > --- > debugfs/set_fields.c | 2 +- > lib/e2p/ls.c | 6 +++--- > lib/ext2fs/ext2_fs.h | 2 +- > lib/ext2fs/swapfs.c | 2 +- > lib/ext2fs/tst_super_size.c | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c > index 5142554d..f497bd92 100644 > --- a/debugfs/set_fields.c > +++ b/debugfs/set_fields.c > @@ -160,7 +160,7 @@ static struct field_set_info super_fields[] = { > { "usr_quota_inum", &set_sb.s_usr_quota_inum, NULL, 4, parse_uint }, > { "grp_quota_inum", &set_sb.s_grp_quota_inum, NULL, 4, parse_uint }, > { "prj_quota_inum", &set_sb.s_prj_quota_inum, NULL, 4, parse_uint }, > - { "overhead_blocks", &set_sb.s_overhead_blocks, NULL, 4, parse_uint }, > + { "overhead_clusters", &set_sb.s_overhead_clusters, NULL, 4, parse_uint }, Should we consider to keep the "overhead_blocks" name for compatibility? It should be listed second, after "overhead_clusters", maybe with a comment. > { "backup_bgs", &set_sb.s_backup_bgs[0], NULL, 4, parse_uint, > FLAG_ARRAY, 2 }, > { "checksum", &set_sb.s_checksum, NULL, 4, parse_uint }, > diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c > index 5a446178..5ca750f6 100644 > --- a/lib/e2p/ls.c > +++ b/lib/e2p/ls.c > @@ -272,9 +272,9 @@ void list_super2(struct ext2_super_block * sb, FILE *f) > fprintf(f, "Inode count: %u\n", sb->s_inodes_count); > fprintf(f, "Block count: %llu\n", e2p_blocks_count(sb)); > fprintf(f, "Reserved block count: %llu\n", e2p_r_blocks_count(sb)); > - if (sb->s_overhead_blocks) > - fprintf(f, "Overhead blocks: %u\n", > - sb->s_overhead_blocks); > + if (sb->s_overhead_clusters) > + fprintf(f, "Overhead clusters: %u\n", > + sb->s_overhead_clusters); > fprintf(f, "Free blocks: %llu\n", e2p_free_blocks_count(sb)); > fprintf(f, "Free inodes: %u\n", sb->s_free_inodes_count); > fprintf(f, "First block: %u\n", sb->s_first_data_block); > diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h > index cbb44bdb..5737dc61 100644 > --- a/lib/ext2fs/ext2_fs.h > +++ b/lib/ext2fs/ext2_fs.h > @@ -742,7 +742,7 @@ struct ext2_super_block { > /*200*/ __u8 s_mount_opts[64]; > /*240*/ __u32 s_usr_quota_inum; /* inode number of user quota file */ > __u32 s_grp_quota_inum; /* inode number of group quota file */ > - __u32 s_overhead_blocks; /* overhead blocks/clusters in fs */ > + __u32 s_overhead_clusters; /* overhead blocks/clusters in fs */ > /*24c*/ __u32 s_backup_bgs[2]; /* If sparse_super2 enabled */ > /*254*/ __u8 s_encrypt_algos[4]; /* Encryption algorithms in use */ > /*258*/ __u8 s_encrypt_pw_salt[16]; /* Salt used for string2key algorithm */ > diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c > index a1560045..63b24330 100644 > --- a/lib/ext2fs/swapfs.c > +++ b/lib/ext2fs/swapfs.c > @@ -121,7 +121,7 @@ void ext2fs_swap_super(struct ext2_super_block * sb) > /* sb->s_mount_opts is __u8 and does not need swabbing */ > sb->s_usr_quota_inum = ext2fs_swab32(sb->s_usr_quota_inum); > sb->s_grp_quota_inum = ext2fs_swab32(sb->s_grp_quota_inum); > - sb->s_overhead_blocks = ext2fs_swab32(sb->s_overhead_blocks); > + sb->s_overhead_clusters = ext2fs_swab32(sb->s_overhead_clusters); > sb->s_backup_bgs[0] = ext2fs_swab32(sb->s_backup_bgs[0]); > sb->s_backup_bgs[1] = ext2fs_swab32(sb->s_backup_bgs[1]); > /* sb->s_encrypt_algos is __u8 and does not need swabbing */ > diff --git a/lib/ext2fs/tst_super_size.c b/lib/ext2fs/tst_super_size.c > index a932685d..ab38dd59 100644 > --- a/lib/ext2fs/tst_super_size.c > +++ b/lib/ext2fs/tst_super_size.c > @@ -135,7 +135,7 @@ int main(int argc, char **argv) > check_field(s_mount_opts, 64); > check_field(s_usr_quota_inum, 4); > check_field(s_grp_quota_inum, 4); > - check_field(s_overhead_blocks, 4); > + check_field(s_overhead_clusters, 4); > check_field(s_backup_bgs, 8); > check_field(s_encrypt_algos, 4); > check_field(s_encrypt_pw_salt, 16); > -- > 2.22.1 > Cheers, Andreas
diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c index 5142554d..f497bd92 100644 --- a/debugfs/set_fields.c +++ b/debugfs/set_fields.c @@ -160,7 +160,7 @@ static struct field_set_info super_fields[] = { { "usr_quota_inum", &set_sb.s_usr_quota_inum, NULL, 4, parse_uint }, { "grp_quota_inum", &set_sb.s_grp_quota_inum, NULL, 4, parse_uint }, { "prj_quota_inum", &set_sb.s_prj_quota_inum, NULL, 4, parse_uint }, - { "overhead_blocks", &set_sb.s_overhead_blocks, NULL, 4, parse_uint }, + { "overhead_clusters", &set_sb.s_overhead_clusters, NULL, 4, parse_uint }, { "backup_bgs", &set_sb.s_backup_bgs[0], NULL, 4, parse_uint, FLAG_ARRAY, 2 }, { "checksum", &set_sb.s_checksum, NULL, 4, parse_uint }, diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c index 5a446178..5ca750f6 100644 --- a/lib/e2p/ls.c +++ b/lib/e2p/ls.c @@ -272,9 +272,9 @@ void list_super2(struct ext2_super_block * sb, FILE *f) fprintf(f, "Inode count: %u\n", sb->s_inodes_count); fprintf(f, "Block count: %llu\n", e2p_blocks_count(sb)); fprintf(f, "Reserved block count: %llu\n", e2p_r_blocks_count(sb)); - if (sb->s_overhead_blocks) - fprintf(f, "Overhead blocks: %u\n", - sb->s_overhead_blocks); + if (sb->s_overhead_clusters) + fprintf(f, "Overhead clusters: %u\n", + sb->s_overhead_clusters); fprintf(f, "Free blocks: %llu\n", e2p_free_blocks_count(sb)); fprintf(f, "Free inodes: %u\n", sb->s_free_inodes_count); fprintf(f, "First block: %u\n", sb->s_first_data_block); diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h index cbb44bdb..5737dc61 100644 --- a/lib/ext2fs/ext2_fs.h +++ b/lib/ext2fs/ext2_fs.h @@ -742,7 +742,7 @@ struct ext2_super_block { /*200*/ __u8 s_mount_opts[64]; /*240*/ __u32 s_usr_quota_inum; /* inode number of user quota file */ __u32 s_grp_quota_inum; /* inode number of group quota file */ - __u32 s_overhead_blocks; /* overhead blocks/clusters in fs */ + __u32 s_overhead_clusters; /* overhead blocks/clusters in fs */ /*24c*/ __u32 s_backup_bgs[2]; /* If sparse_super2 enabled */ /*254*/ __u8 s_encrypt_algos[4]; /* Encryption algorithms in use */ /*258*/ __u8 s_encrypt_pw_salt[16]; /* Salt used for string2key algorithm */ diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c index a1560045..63b24330 100644 --- a/lib/ext2fs/swapfs.c +++ b/lib/ext2fs/swapfs.c @@ -121,7 +121,7 @@ void ext2fs_swap_super(struct ext2_super_block * sb) /* sb->s_mount_opts is __u8 and does not need swabbing */ sb->s_usr_quota_inum = ext2fs_swab32(sb->s_usr_quota_inum); sb->s_grp_quota_inum = ext2fs_swab32(sb->s_grp_quota_inum); - sb->s_overhead_blocks = ext2fs_swab32(sb->s_overhead_blocks); + sb->s_overhead_clusters = ext2fs_swab32(sb->s_overhead_clusters); sb->s_backup_bgs[0] = ext2fs_swab32(sb->s_backup_bgs[0]); sb->s_backup_bgs[1] = ext2fs_swab32(sb->s_backup_bgs[1]); /* sb->s_encrypt_algos is __u8 and does not need swabbing */ diff --git a/lib/ext2fs/tst_super_size.c b/lib/ext2fs/tst_super_size.c index a932685d..ab38dd59 100644 --- a/lib/ext2fs/tst_super_size.c +++ b/lib/ext2fs/tst_super_size.c @@ -135,7 +135,7 @@ int main(int argc, char **argv) check_field(s_mount_opts, 64); check_field(s_usr_quota_inum, 4); check_field(s_grp_quota_inum, 4); - check_field(s_overhead_blocks, 4); + check_field(s_overhead_clusters, 4); check_field(s_backup_bgs, 8); check_field(s_encrypt_algos, 4); check_field(s_encrypt_pw_salt, 16);
Rename s_overhead_blocks field from struct ext2_super_block to make it consistent with the kernel counterpart. Signed-off-by: Li Dongyang <dongyangli@ddn.com> --- debugfs/set_fields.c | 2 +- lib/e2p/ls.c | 6 +++--- lib/ext2fs/ext2_fs.h | 2 +- lib/ext2fs/swapfs.c | 2 +- lib/ext2fs/tst_super_size.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)