diff options
| author | Ken Chen <kenchen@google.com> | 2009-05-28 09:55:10 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-05-28 09:55:10 -0400 |
| commit | 9facd076ae8af6e908e228392cea866ce0faf1bc (patch) | |
| tree | 8180b8b3fccaa86f06e212ed3371bca773c4e107 /e2fsck/pass3.c | |
| parent | fea390e2534907dad42159437e01bd9a4ead2c55 (diff) | |
| download | e2fsprogs-9facd076ae8af6e908e228392cea866ce0faf1bc.tar.gz | |
Add empty function for init_resource_track() and print_resource_track()
in the case of ! defined RESOURCE_TRACK, so that we can clean up #ifdef
throughout e2fsck source.
Signed-off-by: Ken Chen <kenchen@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'e2fsck/pass3.c')
| -rw-r--r-- | e2fsck/pass3.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c index a14bc5d5..5a5fd3e4 100644 --- a/e2fsck/pass3.c +++ b/e2fsck/pass3.c @@ -60,10 +60,7 @@ void e2fsck_pass3(e2fsck_t ctx) struct dir_info *dir; unsigned long maxdirs, count; -#ifdef RESOURCE_TRACK init_resource_track(&rtrack, ctx->fs->io); -#endif - clear_problem_context(&pctx); #ifdef MTRACE @@ -84,13 +81,7 @@ void e2fsck_pass3(e2fsck_t ctx) ctx->flags |= E2F_FLAG_ABORT; goto abort_exit; } -#ifdef RESOURCE_TRACK - if (ctx->options & E2F_OPT_TIME) { - e2fsck_clear_progbar(ctx); - print_resource_track(_("Peak memory"), &ctx->global_rtrack, - NULL); - } -#endif + print_resource_track(ctx, _("Peak memory"), &ctx->global_rtrack, NULL); check_root(ctx); if (ctx->flags & E2F_FLAG_SIGNAL_MASK) @@ -140,12 +131,7 @@ abort_exit: inode_done_map = 0; } -#ifdef RESOURCE_TRACK - if (ctx->options & E2F_OPT_TIME2) { - e2fsck_clear_progbar(ctx); - print_resource_track(_("Pass 3"), &rtrack, ctx->fs->io); - } -#endif + print_resource_track(ctx, _("Pass 3"), &rtrack, ctx->fs->io); } /* |