vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

libext2fs: call numeric_progress functions through a operations struct 

Instead of calling ext2fs_numeric_progress_*() directly from closefs.c
and alloc_tables.c, call it via a operations structure which is only
initialized by the one program (mke2fs) which needs it.

This reduces the number of C library symbols needed by boot loader
systems such as yaboot.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
pu
Theodore Ts'o 2012-07-30 17:16:51 -04:00
parent bc0b1a899a
commit dfe74c5c67
6 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ext2fs/alloc_tables.c
View File

@ -230,16 +230,19 @@ errcode_t ext2fs_allocate_tables(ext2_filsys fs)
dgrp_t i;
struct ext2fs_numeric_progress_struct progress;
ext2fs_numeric_progress_init(fs, &progress, NULL,
fs->group_desc_count);
if (fs->progress_ops && fs->progress_ops->init)
(fs->progress_ops->init)(fs, &progress, NULL,
fs->group_desc_count);
for (i = 0; i < fs->group_desc_count; i++) {
ext2fs_numeric_progress_update(fs, &progress, i);
if (fs->progress_ops && fs->progress_ops->update)
(fs->progress_ops->update)(fs, &progress, i);
retval = ext2fs_allocate_group_table(fs, i, fs->block_map);
if (retval)
return retval;
}
ext2fs_numeric_progress_close(fs, &progress, NULL);
if (fs->progress_ops && fs->progress_ops->close)
(fs->progress_ops->close)(fs, &progress, NULL);
return 0;
}

11
lib/ext2fs/closefs.c
View File

@ -340,14 +340,16 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
else
old_desc_blocks = fs->desc_blocks;
ext2fs_numeric_progress_init(fs, &progress, NULL,
fs->group_desc_count);
if (fs->progress_ops && fs->progress_ops->init)
(fs->progress_ops->init)(fs, &progress, NULL,
fs->group_desc_count);
for (i = 0; i < fs->group_desc_count; i++) {
blk64_t super_blk, old_desc_blk, new_desc_blk;
ext2fs_numeric_progress_update(fs, &progress, i);
if (fs->progress_ops && fs->progress_ops->update)
(fs->progress_ops->update)(fs, &progress, i);
ext2fs_super_and_bgd_loc2(fs, i, &super_blk, &old_desc_blk,
&new_desc_blk, 0);
@ -376,7 +378,8 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
}
}
ext2fs_numeric_progress_close(fs, &progress, NULL);
if (fs->progress_ops && fs->progress_ops->close)
(fs->progress_ops->close)(fs, &progress, NULL);
/*
* If the write_bitmaps() function is present, call it to

3
lib/ext2fs/ext2fs.h
View File

@ -267,6 +267,9 @@ struct struct_ext2_filsys {
* Time at which e2fsck last updated the MMP block.
*/
long mmp_last_written;
/* progress operation functions */
struct ext2fs_progress_ops *progress_ops;
};
#if EXT2_FLAT_INCLUDES

17
lib/ext2fs/ext2fsP.h
View File

@ -95,6 +95,23 @@ struct ext2fs_numeric_progress_struct {
int skip_progress;
};
/*
* progress callback functions
*/
struct ext2fs_progress_ops {
void (*init)(ext2_filsys fs,
struct ext2fs_numeric_progress_struct * progress,
const char *label, __u64 max);
void (*update)(ext2_filsys fs,
struct ext2fs_numeric_progress_struct * progress,
__u64 val);
void (*close)(ext2_filsys fs,
struct ext2fs_numeric_progress_struct * progress,
const char *message);
};
extern struct ext2fs_progress_ops ext2fs_numeric_progress_ops;
extern void ext2fs_numeric_progress_init(ext2_filsys fs,
struct ext2fs_numeric_progress_struct * progress,
const char *label, __u64 max);

6
lib/ext2fs/progress.c
View File

@ -16,6 +16,12 @@
static char spaces[80], backspaces[80];
struct ext2fs_progress_ops ext2fs_numeric_progress_ops = {
.init = ext2fs_numeric_progress_init,
.update = ext2fs_numeric_progress_update,
.close = ext2fs_numeric_progress_close,
};
static int int_log10(unsigned int arg)
{
int l;

1
misc/mke2fs.c
View File

@ -2277,6 +2277,7 @@ int main (int argc, char *argv[])
com_err(device_name, retval, _("while setting up superblock"));
exit(1);
}
fs->progress_ops = &ext2fs_numeric_progress_ops;
/* Can't undo discard ... */
if (!noaction && discard && (io_ptr != undo_io_manager)) {