}
static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
- struct process_block_struct *pb,
+ struct process_block_struct *pb,
+ blk64_t start_block,
ext2_extent_handle_t ehandle)
{
struct ext2fs_extent extent;
if (extent.e_pblk < ctx->fs->super->s_first_data_block ||
extent.e_pblk >= ctx->fs->super->s_blocks_count)
problem = PR_1_EXTENT_BAD_START_BLK;
+ else if (extent.e_lblk < start_block)
+ problem = PR_1_OUT_OF_ORDER_EXTENTS;
else if (is_leaf &&
(extent.e_pblk + extent.e_len) >
ctx->fs->super->s_blocks_count)
error_message(pctx->errcode), pctx->ino);
abort();
}
- scan_extent_node(ctx, pctx, pb, ehandle);
+ scan_extent_node(ctx, pctx, pb, extent.e_lblk, ehandle);
pctx->errcode = ext2fs_extent_get(ehandle,
EXT2_EXTENT_UP, &extent);
if (pctx->errcode) {
}
}
pb->num_blocks += extent.e_len;
- pb->last_block = extent.e_lblk + extent.e_len - 1;
+ start_block = pb->last_block = extent.e_lblk + extent.e_len - 1;
next:
pctx->errcode = ext2fs_extent_get(ehandle,
EXT2_EXTENT_NEXT_SIB,
return;
}
- scan_extent_node(ctx, pctx, pb, ehandle);
+ scan_extent_node(ctx, pctx, pb, 0, ehandle);
ext2fs_extent_free(ehandle);
}
N_("Fast symlink %i has EXTENT_FL set. "),
PROMPT_CLEAR, 0 },
+ /* Extents are out of order */
+ { PR_1_OUT_OF_ORDER_EXTENTS,
+ N_("@i %i has out of order extents\n\t(@n logical @b %c, physical @b %b, len %N)\n"),
+ PROMPT_CLEAR, 0 },
+
/* Pass 1b errors */
/* Pass 1B: Rescan for duplicate/bad blocks */