ext2fs: rename "s_overhead_blocks" to "s_overhead_clusters"

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>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/set_fields.c b/debugfs/set_fields.c
index 5142554..f497bd9 100644 (file)
--- 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 1521099..740bc8d 100644 (file)
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -271,9 +271,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 6fe5cab..6c20ea7 100644 (file)
--- 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];       /* default mount options, no NUL? */
 /*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 e795278..53e7514 100644 (file)
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -120,7 +120,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 a932685..ab38dd5 100644 (file)
--- 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);