Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint' into next
[tools/e2fsprogs.git]
/
e2fsck
/
pass4.c
diff --git
a/e2fsck/pass4.c
b/e2fsck/pass4.c
index
1cb7449
..
0fb8ee7
100644
(file)
--- a/
e2fsck/pass4.c
+++ b/
e2fsck/pass4.c
@@
-10,6
+10,7
@@
*
* Pass 4 frees the following data structures:
* - A bitmap of which inodes are in bad blocks. (inode_bb_map)
*
* Pass 4 frees the following data structures:
* - A bitmap of which inodes are in bad blocks. (inode_bb_map)
+ * - A bitmap of which inodes are imagic inodes. (inode_imagic_map)
*/
#include "e2fsck.h"
*/
#include "e2fsck.h"
@@
-22,7
+23,7
@@
* This subroutine returns 1 then the caller shouldn't bother with the
* rest of the pass 4 tests.
*/
* This subroutine returns 1 then the caller shouldn't bother with the
* rest of the pass 4 tests.
*/
-static int disconnect_inode(e2fsck_t ctx, ino_t i)
+static int disconnect_inode(e2fsck_t ctx,
ext2_
ino_t i)
{
ext2_filsys fs = ctx->fs;
struct ext2_inode inode;
{
ext2_filsys fs = ctx->fs;
struct ext2_inode inode;
@@
-33,15
+34,18
@@
static int disconnect_inode(e2fsck_t ctx, ino_t i)
pctx.ino = i;
pctx.inode = &inode;
pctx.ino = i;
pctx.inode = &inode;
+ /*
+ * Offer to delete any zero-length files that does not have
+ * blocks. If there is an EA block, it might have useful
+ * information, so we won't prompt to delete it, but let it be
+ * reconnected to lost+found.
+ */
if (!inode.i_blocks && (LINUX_S_ISREG(inode.i_mode) ||
LINUX_S_ISDIR(inode.i_mode))) {
if (!inode.i_blocks && (LINUX_S_ISREG(inode.i_mode) ||
LINUX_S_ISDIR(inode.i_mode))) {
- /*
- * This is a zero-length file; prompt to delete it...
- */
if (fix_problem(ctx, PR_4_ZERO_LEN_INODE, &pctx)) {
ext2fs_icount_store(ctx->inode_link_info, i, 0);
inode.i_links_count = 0;
if (fix_problem(ctx, PR_4_ZERO_LEN_INODE, &pctx)) {
ext2fs_icount_store(ctx->inode_link_info, i, 0);
inode.i_links_count = 0;
- inode.i_dtime =
time(0)
;
+ inode.i_dtime =
ctx->now
;
e2fsck_write_inode(ctx, i, &inode,
"disconnect_inode");
/*
e2fsck_write_inode(ctx, i, &inode,
"disconnect_inode");
/*
@@
-50,8
+54,8
@@
static int disconnect_inode(e2fsck_t ctx, ino_t i)
e2fsck_read_bitmaps(ctx);
ext2fs_unmark_inode_bitmap(ctx->inode_used_map, i);
ext2fs_unmark_inode_bitmap(ctx->inode_dir_map, i);
e2fsck_read_bitmaps(ctx);
ext2fs_unmark_inode_bitmap(ctx->inode_used_map, i);
ext2fs_unmark_inode_bitmap(ctx->inode_dir_map, i);
- ext2fs_
unmark_inode_bitmap(fs->inode_map, i);
-
ext2fs_mark_ib_dirty(fs
);
+ ext2fs_
inode_alloc_stats2(fs, i, -1,
+
LINUX_S_ISDIR(inode.i_mode)
);
return 0;
}
}
return 0;
}
}
@@
-78,17
+82,18
@@
static int disconnect_inode(e2fsck_t ctx, ino_t i)
void e2fsck_pass4(e2fsck_t ctx)
{
ext2_filsys fs = ctx->fs;
void e2fsck_pass4(e2fsck_t ctx)
{
ext2_filsys fs = ctx->fs;
-
ino_t
i;
+
ext2_ino_t
i;
struct ext2_inode inode;
#ifdef RESOURCE_TRACK
struct resource_track rtrack;
#endif
struct problem_context pctx;
__u16 link_count, link_counted;
struct ext2_inode inode;
#ifdef RESOURCE_TRACK
struct resource_track rtrack;
#endif
struct problem_context pctx;
__u16 link_count, link_counted;
- int group, max, j;
+ char *buf = 0;
+ int group, maxgroup;
#ifdef RESOURCE_TRACK
#ifdef RESOURCE_TRACK
- init_resource_track(&rtrack);
+ init_resource_track(&rtrack
, ctx->fs->io
);
#endif
#ifdef MTRACE
#endif
#ifdef MTRACE
@@
-101,28
+106,38
@@
void e2fsck_pass4(e2fsck_t ctx)
fix_problem(ctx, PR_4_PASS_HEADER, &pctx);
group = 0;
fix_problem(ctx, PR_4_PASS_HEADER, &pctx);
group = 0;
- max = fs->group_desc_count;
+ max
group
= fs->group_desc_count;
if (ctx->progress)
if (ctx->progress)
- if ((ctx->progress)(ctx, 4, 0, max))
+ if ((ctx->progress)(ctx, 4, 0, max
group
))
return;
return;
-
- for (i=1; i <= fs->super->s_inodes_count; i++) {
+
+ /* Protect loop from wrap-around if s_inodes_count maxed */
+ for (i=1; i <= fs->super->s_inodes_count && i > 0; i++) {
+ if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
+ goto errout;
if ((i % fs->super->s_inodes_per_group) == 0) {
group++;
if (ctx->progress)
if ((i % fs->super->s_inodes_per_group) == 0) {
group++;
if (ctx->progress)
- if ((ctx->progress)(ctx, 4, group, max))
-
return
;
+ if ((ctx->progress)(ctx, 4, group, max
group
))
+
goto errout
;
}
if (i == EXT2_BAD_INO ||
(i > EXT2_ROOT_INO && i < EXT2_FIRST_INODE(fs->super)))
continue;
if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map, i)) ||
}
if (i == EXT2_BAD_INO ||
(i > EXT2_ROOT_INO && i < EXT2_FIRST_INODE(fs->super)))
continue;
if (!(ext2fs_test_inode_bitmap(ctx->inode_used_map, i)) ||
+ (ctx->inode_imagic_map &&
+ ext2fs_test_inode_bitmap(ctx->inode_imagic_map, i)) ||
(ctx->inode_bb_map &&
ext2fs_test_inode_bitmap(ctx->inode_bb_map, i)))
continue;
ext2fs_icount_fetch(ctx->inode_link_info, i, &link_count);
ext2fs_icount_fetch(ctx->inode_count, i, &link_counted);
if (link_counted == 0) {
(ctx->inode_bb_map &&
ext2fs_test_inode_bitmap(ctx->inode_bb_map, i)))
continue;
ext2fs_icount_fetch(ctx->inode_link_info, i, &link_count);
ext2fs_icount_fetch(ctx->inode_count, i, &link_counted);
if (link_counted == 0) {
+ if (!buf)
+ buf = e2fsck_allocate_memory(ctx,
+ fs->blocksize, "bad_inode buffer");
+ if (e2fsck_process_bad_inode(ctx, 0, i, buf))
+ continue;
if (disconnect_inode(ctx, i))
continue;
ext2fs_icount_fetch(ctx->inode_link_info, i,
if (disconnect_inode(ctx, i))
continue;
ext2fs_icount_fetch(ctx->inode_link_info, i,
@@
-150,9
+165,16
@@
void e2fsck_pass4(e2fsck_t ctx)
ext2fs_free_icount(ctx->inode_count); ctx->inode_count = 0;
ext2fs_free_inode_bitmap(ctx->inode_bb_map);
ctx->inode_bb_map = 0;
ext2fs_free_icount(ctx->inode_count); ctx->inode_count = 0;
ext2fs_free_inode_bitmap(ctx->inode_bb_map);
ctx->inode_bb_map = 0;
+ ext2fs_free_inode_bitmap(ctx->inode_imagic_map);
+ ctx->inode_imagic_map = 0;
+errout:
+ if (buf)
+ ext2fs_free_mem(&buf);
#ifdef RESOURCE_TRACK
#ifdef RESOURCE_TRACK
- if (ctx->options & E2F_OPT_TIME2)
- print_resource_track("Pass 4", &rtrack);
+ if (ctx->options & E2F_OPT_TIME2) {
+ e2fsck_clear_progbar(ctx);
+ print_resource_track(_("Pass 4"), &rtrack, ctx->fs->io);
+ }
#endif
}
#endif
}