diff options
| author | Valerie Aurora Henson <vaurora@redhat.com> | 2009-09-07 20:46:34 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-09-07 20:46:34 -0400 |
| commit | 4efbac6fed75c29d3d5f1b676b932754653a2ac5 (patch) | |
| tree | b5abaa3d97e473970064e649d9ed6f661b447a22 /ext2ed | |
| parent | a63745e81cbb476b90c75ca3ca60b9ba4be95cae (diff) | |
| download | e2fsprogs-4efbac6fed75c29d3d5f1b676b932754653a2ac5.tar.gz | |
Convert uses of super->s_*_blocks_count to ext2fs_*_blocks_count()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'ext2ed')
| -rw-r--r-- | ext2ed/init.c | 11 | ||||
| -rw-r--r-- | ext2ed/super_com.c | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/ext2ed/init.c b/ext2ed/init.c index 41c2a398..3815ab56 100644 --- a/ext2ed/init.c +++ b/ext2ed/init.c @@ -370,13 +370,6 @@ void add_user_command (struct struct_commands *ptr,char *name,char *description, ptr->callback [num]=callback; } -static unsigned int div_ceil(unsigned int a, unsigned int b) -{ - if (!a) - return 0; - return ((a - 1) / b) + 1; -} - int set_file_system_info (void) { @@ -422,13 +415,13 @@ int set_file_system_info (void) file_system_info.first_group_desc_offset=2*EXT2_MIN_BLOCK_SIZE; else file_system_info.first_group_desc_offset=file_system_info.block_size; - file_system_info.groups_count = div_ceil(sb->s_blocks_count, + file_system_info.groups_count = ext2fs_div64_ceil(ext2fs_blocks_count(sb), sb->s_blocks_per_group); file_system_info.inodes_per_block=file_system_info.block_size/sizeof (struct ext2_inode); file_system_info.blocks_per_group=sb->s_inodes_per_group/file_system_info.inodes_per_block; file_system_info.no_blocks_in_group=sb->s_blocks_per_group; - file_system_info.file_system_size=(sb->s_blocks_count-1)*file_system_info.block_size; + file_system_info.file_system_size=(ext2fs_blocks_count(sb)-1)*file_system_info.block_size; } else { diff --git a/ext2ed/super_com.c b/ext2ed/super_com.c index 3d30070b..57953ab6 100644 --- a/ext2ed/super_com.c +++ b/ext2ed/super_com.c @@ -29,9 +29,9 @@ void type_ext2_super_block___show (char *command_line) show (command_line); - if (super->s_blocks_count != 0) { - wmove (show_pad,2,40);wprintw (show_pad,"%2.2f%%",100*(float) super->s_r_blocks_count/ (float) super->s_blocks_count); - wmove (show_pad,3,40);wprintw (show_pad,"%2.2f%%",100*(float) super->s_free_blocks_count/ (float) super->s_blocks_count); + if (ext2fs_blocks_count(super) != 0) { + wmove (show_pad,2,40);wprintw (show_pad,"%2.2f%%",100*(float) ext2fs_r_blocks_count(super)/ (float) ext2fs_blocks_count(super)); + wmove (show_pad,3,40);wprintw (show_pad,"%2.2f%%",100*(float) ext2fs_free_blocks_count(super)/ (float) ext2fs_blocks_count(super)); } if (super->s_inodes_count != 0) { |