diff options
Diffstat (limited to 'e2fsprogs/e2fsck.c')
-rw-r--r-- | e2fsprogs/e2fsck.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c index 0282d328f..4c0614add 100644 --- a/e2fsprogs/e2fsck.c +++ b/e2fsprogs/e2fsck.c | |||
@@ -1469,7 +1469,7 @@ static void ll_rw_block(int rw, int nr, struct buffer_head *bhp[]) | |||
1469 | bh->b_blocknr, | 1469 | bh->b_blocknr, |
1470 | 1, bh->b_data); | 1470 | 1, bh->b_data); |
1471 | if (retval) { | 1471 | if (retval) { |
1472 | bb_error_msg("while reading block %lu\n", | 1472 | bb_error_msg("while reading block %lu", |
1473 | (unsigned long) bh->b_blocknr); | 1473 | (unsigned long) bh->b_blocknr); |
1474 | bh->b_err = retval; | 1474 | bh->b_err = retval; |
1475 | continue; | 1475 | continue; |
@@ -1480,7 +1480,7 @@ static void ll_rw_block(int rw, int nr, struct buffer_head *bhp[]) | |||
1480 | bh->b_blocknr, | 1480 | bh->b_blocknr, |
1481 | 1, bh->b_data); | 1481 | 1, bh->b_data); |
1482 | if (retval) { | 1482 | if (retval) { |
1483 | bb_error_msg("while writing block %lu\n", | 1483 | bb_error_msg("while writing block %lu", |
1484 | (unsigned long) bh->b_blocknr); | 1484 | (unsigned long) bh->b_blocknr); |
1485 | bh->b_err = retval; | 1485 | bh->b_err = retval; |
1486 | continue; | 1486 | continue; |
@@ -1796,7 +1796,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal) | |||
1796 | 1796 | ||
1797 | ll_rw_block(READ, 1, &jbh); | 1797 | ll_rw_block(READ, 1, &jbh); |
1798 | if (jbh->b_err) { | 1798 | if (jbh->b_err) { |
1799 | bb_error_msg(_("reading journal superblock\n")); | 1799 | bb_error_msg(_("reading journal superblock")); |
1800 | return jbh->b_err; | 1800 | return jbh->b_err; |
1801 | } | 1801 | } |
1802 | 1802 | ||
@@ -1852,7 +1852,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal) | |||
1852 | * format to be able to proceed safely, so any other checks that | 1852 | * format to be able to proceed safely, so any other checks that |
1853 | * fail we should attempt to recover from. */ | 1853 | * fail we should attempt to recover from. */ |
1854 | if (jsb->s_blocksize != htonl(journal->j_blocksize)) { | 1854 | if (jsb->s_blocksize != htonl(journal->j_blocksize)) { |
1855 | bb_error_msg(_("%s: no valid journal superblock found\n"), | 1855 | bb_error_msg(_("%s: no valid journal superblock found"), |
1856 | ctx->device_name); | 1856 | ctx->device_name); |
1857 | return EXT2_ET_CORRUPT_SUPERBLOCK; | 1857 | return EXT2_ET_CORRUPT_SUPERBLOCK; |
1858 | } | 1858 | } |
@@ -1860,7 +1860,7 @@ static errcode_t e2fsck_journal_load(journal_t *journal) | |||
1860 | if (ntohl(jsb->s_maxlen) < journal->j_maxlen) | 1860 | if (ntohl(jsb->s_maxlen) < journal->j_maxlen) |
1861 | journal->j_maxlen = ntohl(jsb->s_maxlen); | 1861 | journal->j_maxlen = ntohl(jsb->s_maxlen); |
1862 | else if (ntohl(jsb->s_maxlen) > journal->j_maxlen) { | 1862 | else if (ntohl(jsb->s_maxlen) > journal->j_maxlen) { |
1863 | bb_error_msg(_("%s: journal too short\n"), | 1863 | bb_error_msg(_("%s: journal too short"), |
1864 | ctx->device_name); | 1864 | ctx->device_name); |
1865 | return EXT2_ET_CORRUPT_SUPERBLOCK; | 1865 | return EXT2_ET_CORRUPT_SUPERBLOCK; |
1866 | } | 1866 | } |
@@ -5108,7 +5108,7 @@ static int delete_file_block(ext2_filsys fs, | |||
5108 | p = (struct dup_block *) dnode_get(n); | 5108 | p = (struct dup_block *) dnode_get(n); |
5109 | decrement_badcount(ctx, *block_nr, p); | 5109 | decrement_badcount(ctx, *block_nr, p); |
5110 | } else | 5110 | } else |
5111 | bb_error_msg(_("internal error; can't find dup_blk for %d\n"), | 5111 | bb_error_msg(_("internal error; can't find dup_blk for %d"), |
5112 | *block_nr); | 5112 | *block_nr); |
5113 | } else { | 5113 | } else { |
5114 | ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr); | 5114 | ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr); |
@@ -5241,7 +5241,7 @@ static int clone_file_block(ext2_filsys fs, | |||
5241 | ext2fs_mark_block_bitmap(fs->block_map, new_block); | 5241 | ext2fs_mark_block_bitmap(fs->block_map, new_block); |
5242 | return BLOCK_CHANGED; | 5242 | return BLOCK_CHANGED; |
5243 | } else | 5243 | } else |
5244 | bb_error_msg(_("internal error; can't find dup_blk for %d\n"), | 5244 | bb_error_msg(_("internal error; can't find dup_blk for %d"), |
5245 | *block_nr); | 5245 | *block_nr); |
5246 | } | 5246 | } |
5247 | return 0; | 5247 | return 0; |
@@ -12657,7 +12657,7 @@ static void check_mount(e2fsck_t ctx) | |||
12657 | 12657 | ||
12658 | printf(_("%s is mounted. "), ctx->filesystem_name); | 12658 | printf(_("%s is mounted. "), ctx->filesystem_name); |
12659 | if (!ctx->interactive) | 12659 | if (!ctx->interactive) |
12660 | bb_error_msg_and_die(_("Cannot continue, aborting.\n\n")); | 12660 | bb_error_msg_and_die(_("Cannot continue, aborting.")); |
12661 | printf(_("\n\n\007\007\007\007WARNING!!! " | 12661 | printf(_("\n\n\007\007\007\007WARNING!!! " |
12662 | "Running e2fsck on a mounted filesystem may cause\n" | 12662 | "Running e2fsck on a mounted filesystem may cause\n" |
12663 | "SEVERE filesystem damage.\007\007\007\n\n")); | 12663 | "SEVERE filesystem damage.\007\007\007\n\n")); |
@@ -13377,7 +13377,7 @@ restart: | |||
13377 | * happen, unless the hardware or | 13377 | * happen, unless the hardware or |
13378 | * device driver is being bogus. | 13378 | * device driver is being bogus. |
13379 | */ | 13379 | */ |
13380 | bb_error_msg(_("unable to set superblock flags on %s\n"), ctx->device_name); | 13380 | bb_error_msg(_("unable to set superblock flags on %s"), ctx->device_name); |
13381 | bb_error_msg_and_die(0); | 13381 | bb_error_msg_and_die(0); |
13382 | } | 13382 | } |
13383 | retval = e2fsck_run_ext3_journal(ctx); | 13383 | retval = e2fsck_run_ext3_journal(ctx); |
@@ -13409,12 +13409,12 @@ restart: | |||
13409 | #ifdef ENABLE_COMPRESSION | 13409 | #ifdef ENABLE_COMPRESSION |
13410 | /* FIXME - do we support this at all? */ | 13410 | /* FIXME - do we support this at all? */ |
13411 | if (sb->s_feature_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) | 13411 | if (sb->s_feature_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) |
13412 | bb_error_msg(_("Warning: compression support is experimental.\n")); | 13412 | bb_error_msg(_("Warning: compression support is experimental.")); |
13413 | #endif | 13413 | #endif |
13414 | #ifndef ENABLE_HTREE | 13414 | #ifndef ENABLE_HTREE |
13415 | if (sb->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) { | 13415 | if (sb->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) { |
13416 | bb_error_msg(_("E2fsck not compiled with HTREE support,\n\t" | 13416 | bb_error_msg(_("E2fsck not compiled with HTREE support,\n\t" |
13417 | "but filesystem %s has HTREE directories.\n"), | 13417 | "but filesystem %s has HTREE directories."), |
13418 | ctx->device_name); | 13418 | ctx->device_name); |
13419 | goto get_newer; | 13419 | goto get_newer; |
13420 | } | 13420 | } |