Index: e2fsprogs-1.39-tyt3-v7/lib/ext2fs/extent.c
===================================================================
--- e2fsprogs-1.39-tyt3-v7.orig/lib/ext2fs/extent.c 2007-06-21 13:15:43.000000000 +0200
+++ e2fsprogs-1.39-tyt3-v7/lib/ext2fs/extent.c 2007-06-21 13:16:42.000000000 +0200
@@ -105,8 +105,7 @@ errcode_t ext2fs_extent_verify(ext2_fils
struct ext3_extent_idx *ix, int ix_len)
{
ext_show_extent(ex);
- /* FIXME: 48-bit support */
- if (ex->ee_start > EXT2_BLOCKS_COUNT(fs->super))
+ if (EXT4_EE_START(fs->super, ex) > EXT2_BLOCKS_COUNT(fs->super))
return EXT2_ET_EXTENT_LEAF_BAD;
if (ex->ee_len == 0)
@@ -120,19 +119,19 @@ errcode_t ext2fs_extent_verify(ext2_fils
if (ex->ee_block == 0)
return EXT2_ET_EXTENT_LEAF_BAD;
- /* FIXME: 48-bit support */
/* extents must be in logical offset order */
if (ex->ee_block < ex_prev->ee_block + ex_prev->ee_len)
return EXT2_ET_EXTENT_LEAF_BAD;
/* extents must not overlap physical blocks */
- if ((ex->ee_start < ex_prev->ee_start + ex_prev->ee_len) &&
- (ex->ee_start + ex->ee_len > ex_prev->ee_start))
+ if ((EXT4_EE_START(fs->super, ex) <
+ EXT4_EE_START(fs->super, ex_prev) + ex_prev->ee_len) &&
+ (EXT4_EE_START(fs->super, ex) + ex->ee_len >
+ EXT4_EE_START(fs->super, ex_prev)))
return EXT2_ET_EXTENT_LEAF_BAD;
}
if (ix) {
- /* FIXME: 48-bit support */
if (ex->ee_block < ix->ei_block)
return EXT2_ET_EXTENT_LEAF_BAD;
@@ -148,8 +147,7 @@ errcode_t ext2fs_extent_index_verify(ext
struct ext3_extent_idx *ix_prev)
{
ext_show_index(ix);
- /* FIXME: 48-bit support */
- if (ix->ei_leaf > EXT2_BLOCKS_COUNT(fs->super))
+ if (EXT4_EI_LEAF(fs->super, ix) > EXT2_BLOCKS_COUNT(fs->super))
return EXT2_ET_EXTENT_INDEX_BAD;
if (ix_prev == NULL)
@@ -181,7 +179,8 @@ errcode_t ext2fs_extent_remove(struct ex
return 0;
}
-errcode_t ext2fs_extent_split_internal(struct ext3_extent_header *eh,
+errcode_t ext2fs_extent_split_internal(ext2_filsys fs,
+ struct ext3_extent_header *eh,
struct ext3_extent *ex, int offs)
{
int entry = ex - EXT_FIRST_EXTENT(eh);
@@ -193,10 +192,10 @@ errcode_t ext2fs_extent_split_internal(s
++eh->eh_entries;
ex->ee_len = offs;
- /* FIXME: 48-bit support */
ex_new->ee_len -= offs;
ex_new->ee_block += offs;
- ex_new->ee_start += offs;
+ EXT4_EE_START_SET(fs->super, ex_new,
+ EXT4_EE_START(fs->super, ex_new) + offs);
return 0;
}
@@ -264,7 +263,7 @@ errcode_t ext2fs_extent_split(ext2_filsy
}
}
- return ext2fs_extent_split_internal(*eh_orig, *ex_orig, offs);
+ return ext2fs_extent_split_internal(fs, *eh_orig, *ex_orig, offs);
}
errcode_t ext2fs_extent_index_remove(struct ext3_extent_header *eh,
Index: e2fsprogs-1.39-tyt3-v7/lib/ext2fs/ext3_extents.h
===================================================================
--- e2fsprogs-1.39-tyt3-v7.orig/lib/ext2fs/ext3_extents.h 2007-06-21 13:15:43.000000000 +0200
+++ e2fsprogs-1.39-tyt3-v7/lib/ext2fs/ext3_extents.h 2007-06-21 13:16:42.000000000 +0200
@@ -87,6 +87,34 @@ struct ext3_extent_idx {
__u16 ei_unused;
};
+#define EXT4_EE_START(s, e) \
+ ((e)->ee_start + \
+ (((s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) && \
+ (EXT2_BLOCKS_COUNT(s) > ((unsigned) 1 << 31)) ? \
+ (__u64)(e)->ee_start_hi << 32 : 0))
+
+#define EXT4_EI_LEAF(s, ix) \
+ ((ix)->ei_leaf + \
+ (((s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) && \
+ (EXT2_BLOCKS_COUNT(s) > ((unsigned) 1 << 31)) ? \
+ (__u64)(ix)->ei_leaf_hi << 32 : 0))
+
+#define EXT4_EE_START_SET(s,e,blk) \
+ do { \
+ (e)->ee_start = (blk); \
+ if ((s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT \
+ && EXT2_BLOCKS_COUNT(s) > ((unsigned) 1 << 31)) \
+ (e)->ee_start_hi = (__u64)(blk) >> 32; \
+ } while(0)
+
+#define EXT4_EI_LEAF_SET(s,e,blk) \
+ do { \
+ (ix)->ei_leaf = (blk); \
+ if ((s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT \
+ && EXT2_BLOCKS_COUNT(s) > ((unsigned) 1 << 31)) \
+ (ix)->ei_leaf_hi = (__u64)(blk) >> 32; \
+ } while(0)
+
/*
* each block (leaves and indexes), even inode-stored has header
*/
Index: e2fsprogs-1.39-tyt3-v7/lib/ext2fs/bmap.c
===================================================================
--- e2fsprogs-1.39-tyt3-v7.orig/lib/ext2fs/bmap.c 2007-06-21 13:15:43.000000000 +0200
+++ e2fsprogs-1.39-tyt3-v7/lib/ext2fs/bmap.c 2007-06-21 13:16:42.000000000 +0200
@@ -52,8 +52,8 @@ static errcode_t block_bmap_extents(void
continue;
if (block < ex->ee_block + ex->ee_len)
- /* FIXME: 48-bit */
- *phys_blk = ex->ee_start + block - ex->ee_block;
+ *phys_blk = EXT4_EE_START(fs->super, ex) +
+ (block - ex->ee_block);
/* only the first extent > block could hold the block
* otherwise the extents would overlap */
@@ -72,8 +72,9 @@ static errcode_t block_bmap_extents(void
if (block < ix->ei_block)
continue;
- ret = io_channel_read_blk(fs->io, ix->ei_leaf, 1,
- block_buf);
+ ret = io_channel_read_blk(fs->io,
+ EXT4_EI_LEAF(fs->super, ix),
+ 1, block_buf);
if (ret)
goto free_buf;
Index: e2fsprogs-1.39-tyt3-v7/e2fsck/pass1.c
===================================================================
--- e2fsprogs-1.39-tyt3-v7.orig/e2fsck/pass1.c 2007-06-21 13:15:43.000000000 +0200
+++ e2fsprogs-1.39-tyt3-v7/e2fsck/pass1.c 2007-06-21 13:16:42.000000000 +0200
@@ -1604,6 +1604,10 @@ static int e2fsck_ext_block_verify(struc
e2fsck_t ctx = p->ctx;
struct problem_context *pctx = p->pctx;
int i, problem = 0;
+ int flag_64bit;
+
+ flag_64bit = p->ctx->fs->super->s_feature_incompat &
+ EXT4_FEATURE_INCOMPAT_64BIT;
if (ext2fs_extent_header_verify(eh, buflen))
return PR_1_EXTENT_IDX_BAD;
@@ -1618,9 +1622,8 @@ static int e2fsck_ext_block_verify(struc
struct ext3_extent *ex = EXT_FIRST_EXTENT(eh), *ex_prev = NULL;
for (i = 0; i < eh->eh_entries; i++, ex++) {
- /* FIXME: 48-bit check for s_blocks_count_hi */
- if (ex->ee_start_hi && fix_problem(ctx, PR_1_EXTENT_HI,
- pctx)) {
+ if (!flag_64bit && ex->ee_start_hi &&
+ fix_problem(ctx, PR_1_EXTENT_HI, pctx)) {
ex->ee_start_hi = 0;
problem = PR_1_EXTENT_CHANGED;
}
@@ -1644,9 +1647,9 @@ static int e2fsck_ext_block_verify(struc
struct ext3_extent_idx *ix =EXT_FIRST_INDEX(eh), *ix_prev =NULL;
for (i = 0; i < eh->eh_entries; i++, ix++) {
- /* FIXME: 48-bit check for s_blocks_count_hi */
- if (ix->ei_leaf_hi && fix_problem(ctx, PR_1_EXTENT_HI,
- pctx)) {
+ if (!flag_64bit &&
+ ix->ei_leaf_hi &&
+ fix_problem(ctx, PR_1_EXTENT_HI, pctx)) {
ix->ei_leaf_hi = ix->ei_unused = 0;
problem = PR_1_EXTENT_CHANGED;
}
On Jun 21, 2007 17:31 +0200, Valerie Clement wrote:
> +#define EXT4_EE_START(s, e) \
> + ((e)->ee_start + \
> + (((s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) && \
> + (EXT2_BLOCKS_COUNT(s) > ((unsigned) 1 << 31)) ? \
> + (__u64)(e)->ee_start_hi << 32 : 0))
Isn't the INCOMPAT_64BIT check already part of EXT2_BLOCKS_COUNT()?
It should be impossible to have the "> (1 << 31)" check be true for
a non-64-bit filesystem in that case. Also, why check for > (1 << 31)
instead of >= (1 << 32)?
> +#define EXT4_EE_START_SET(s,e,blk) \
> + do { \
> + (e)->ee_start = (blk); \
> + if ((s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT \
> + && EXT2_BLOCKS_COUNT(s) > ((unsigned) 1 << 31)) \
> + (e)->ee_start_hi = (__u64)(blk) >> 32; \
Here you should always set ee_start_hi = 0, so there is no need for
a conditional here. It is only needed for the read because initial versions
of the extents code didn't clear ee_start_hi, so it deserves making a comment
to that effect above EXT4_EE_START() and EXT4_EI_LEAF(). One day we may
want to remove that hack and assume *_hi == 0 for all filesystems.
> +#define EXT4_EI_LEAF_SET(s,e,blk) \
> + do { \
> + (ix)->ei_leaf = (blk); \
> + if ((s)->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT \
> + && EXT2_BLOCKS_COUNT(s) > ((unsigned) 1 << 31)) \
> + (ix)->ei_leaf_hi = (__u64)(blk) >> 32; \
> + } while(0)
Same as above.
> @@ -1604,6 +1604,10 @@ static int e2fsck_ext_block_verify(struc
> e2fsck_t ctx = p->ctx;
> struct problem_context *pctx = p->pctx;
> int i, problem = 0;
> + int flag_64bit;
> +
> + flag_64bit = p->ctx->fs->super->s_feature_incompat &
> + EXT4_FEATURE_INCOMPAT_64BIT;
Presumably we have verified INCOMPAT_64BIT is set for filesystems with
more than 2^32 blocks in the superblock and the device size?
Cheers, Andreas
--
Andreas Dilger
Principal Software Engineer
Cluster File Systems, Inc.