e2fsck: allow admin specify number of threads

[tools/e2fsprogs.git] / e2fsck / badblocks.c

diff --git a/e2fsck/badblocks.c b/e2fsck/badblocks.c
index 71b1c56..fec5f10 100644 (file)
--- a/e2fsck/badblocks.c
+++ b/e2fsck/badblocks.c
@@ -42,7 +42,7 @@ void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file,
        retval = ext2fs_block_iterate(fs, EXT2_BAD_INO, 0, 0,
                                      check_bb_inode_blocks, 0);
        if (retval) {
-               com_err("ext2fs_block_iterate", retval,
+               com_err("ext2fs_block_iterate", retval, "%s",
                        _("while sanity checking the bad blocks inode"));
                goto fatal;
        }
@@ -54,7 +54,7 @@ void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file,
        if (!replace_bad_blocks) {
                retval = ext2fs_read_bb_inode(fs, &bb_list);
                if (retval) {
-                       com_err("ext2fs_read_bb_inode", retval,
+                       com_err("ext2fs_read_bb_inode", retval, "%s",
                                _("while reading the bad blocks inode"));
                        goto fatal;
                }
@@ -76,7 +76,8 @@ void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file,
                sprintf(buf, "badblocks -b %d -X %s%s%s %llu", fs->blocksize,
                        (ctx->options & E2F_OPT_PREEN) ? "" : "-s ",
                        (ctx->options & E2F_OPT_WRITECHECK) ? "-n " : "",
-                       fs->device_name, ext2fs_blocks_count(fs->super)-1);
+                       fs->device_name,
+                       (unsigned long long) ext2fs_blocks_count(fs->super)-1);
                f = popen(buf, "r");
                if (!f) {
                        com_err("read_bad_blocks_file", errno,
@@ -90,7 +91,7 @@ void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file,
        else
                pclose(f);
        if (retval) {
-               com_err("ext2fs_read_bb_FILE", retval,
+               com_err("ext2fs_read_bb_FILE", retval, "%s",
                        _("while reading in list of bad blocks from file"));
                goto fatal;
        }
@@ -101,7 +102,7 @@ void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file,
        printf("%s: Updating bad block inode.\n", ctx->device_name);
        retval = ext2fs_update_bb_inode(fs, bb_list);
        if (retval) {
-               com_err("ext2fs_update_bb_inode", retval,
+               com_err("ext2fs_update_bb_inode", retval, "%s",
                        _("while updating bad block inode"));
                goto fatal;
        }
@@ -111,6 +112,8 @@ void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file,
 
 fatal:
        ctx->flags |= E2F_FLAG_ABORT;
+       if (bb_list)
+               ext2fs_badblocks_list_free(bb_list);
        return;
 
 }