From 611378fe20777da83fcc8fe77ff2c515b7dc1e42 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 28 Oct 2008 14:44:21 -0600 Subject: [PATCH] e2fsck: print unsigned RAM usage statistics Running e2fsck against a 14.5TB filesystem with -tt it reported -200904kB for RAM usage in pass3 instead of the correct 2300773kB. The RAM usage statistics were being printed with %d instead of %u. Also fix a few places using %ld for inode numbers instead of %lu. Signed-off-by: Andreas Dilger Signed-off-by: "Theodore Ts'o" --- e2fsck/util.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/e2fsck/util.c b/e2fsck/util.c index 6be1923..6101d3c 100644 --- a/e2fsck/util.c +++ b/e2fsck/util.c @@ -66,7 +66,7 @@ void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size, char buf[256]; #ifdef DEBUG_ALLOCATE_MEMORY - printf("Allocating %d bytes for %s...\n", size, description); + printf("Allocating %u bytes for %s...\n", size, description); #endif ret = malloc(size); if (!ret) { @@ -333,11 +333,11 @@ void print_resource_track(const char *desc, struct resource_track *track, #define kbytes(x) (((x) + 1023) / 1024) malloc_info = mallinfo(); - printf(_("Memory used: %dk/%dk (%dk/%dk), "), + printf(_("Memory used: %uk/%uk (%uk/%uk), "), kbytes(malloc_info.arena), kbytes(malloc_info.hblkhd), kbytes(malloc_info.uordblks), kbytes(malloc_info.fordblks)); #else - printf(_("Memory used: %d, "), + printf(_("Memory used: %u, "), (int) (((char *) sbrk(0)) - ((char *) track->brk_start))); #endif #ifdef HAVE_GETRUSAGE @@ -382,7 +382,7 @@ void e2fsck_read_inode(e2fsck_t ctx, unsigned long ino, retval = ext2fs_read_inode(ctx->fs, ino, inode); if (retval) { com_err("ext2fs_read_inode", retval, - _("while reading inode %ld in %s"), ino, proc); + _("while reading inode %lu in %s"), ino, proc); fatal_error(ctx, 0); } } @@ -396,7 +396,7 @@ void e2fsck_read_inode_full(e2fsck_t ctx, unsigned long ino, retval = ext2fs_read_inode_full(ctx->fs, ino, inode, bufsize); if (retval) { com_err("ext2fs_read_inode_full", retval, - _("while reading inode %ld in %s"), ino, proc); + _("while reading inode %lu in %s"), ino, proc); fatal_error(ctx, 0); } } @@ -410,7 +410,7 @@ extern void e2fsck_write_inode_full(e2fsck_t ctx, unsigned long ino, retval = ext2fs_write_inode_full(ctx->fs, ino, inode, bufsize); if (retval) { com_err("ext2fs_write_inode", retval, - _("while writing inode %ld in %s"), ino, proc); + _("while writing inode %lu in %s"), ino, proc); fatal_error(ctx, 0); } } @@ -423,7 +423,7 @@ extern void e2fsck_write_inode(e2fsck_t ctx, unsigned long ino, retval = ext2fs_write_inode(ctx->fs, ino, inode); if (retval) { com_err("ext2fs_write_inode", retval, - _("while writing inode %ld in %s"), ino, proc); + _("while writing inode %lu in %s"), ino, proc); fatal_error(ctx, 0); } } -- 1.8.3.1