static void dbg_show_header(struct ext3_extent_header *eh)
{
printf("header: magic=%x entries=%u max=%u depth=%u generation=%u\n",
- eh->eh_magic, eh->eh_entries, eh->eh_max, eh->eh_depth,
- eh->eh_generation);
+ ext2fs_le16_to_cpu(eh->eh_magic),
+ ext2fs_le16_to_cpu(eh->eh_entries),
+ ext2fs_le16_to_cpu(eh->eh_max),
+ ext2fs_le16_to_cpu(eh->eh_depth),
+ ext2fs_le32_to_cpu(eh->eh_generation));
}
static void dbg_show_index(struct ext3_extent_idx *ix)
{
printf("index: block=%u leaf=%u leaf_hi=%u unused=%u\n",
- ix->ei_block, ix->ei_leaf, ix->ei_leaf_hi, ix->ei_unused);
+ ext2fs_le32_to_cpu(ix->ei_block),
+ ext2fs_le32_to_cpu(ix->ei_leaf),
+ ext2fs_le16_to_cpu(ix->ei_leaf_hi),
+ ext2fs_le16_to_cpu(ix->ei_unused));
}
static void dbg_show_extent(struct ext3_extent *ex)
{
printf("extent: block=%u-%u len=%u start=%u start_hi=%u\n",
- ex->ee_block, ex->ee_block + ex->ee_len - 1,
- ex->ee_len, ex->ee_start, ex->ee_start_hi);
+ ext2fs_le32_to_cpu(ex->ee_block),
+ ext2fs_le32_to_cpu(ex->ee_block) +
+ ext2fs_le16_to_cpu(ex->ee_len) - 1,
+ ext2fs_le16_to_cpu(ex->ee_len),
+ ext2fs_le32_to_cpu(ex->ee_start),
+ ext2fs_le16_to_cpu(ex->ee_start_hi));
}
static void dbg_print_extent(char *desc, struct ext2fs_extent *extent)
}
-#define dbg_printf(fmt, args...) printf(fmt, ## args)
#else
#define dbg_show_header(eh) do { } while (0)
#define dbg_show_index(ix) do { } while (0)
#define dbg_show_extent(ex) do { } while (0)
#define dbg_print_extent(desc, ex) do { } while (0)
-#define dbg_printf(fmt, args...) do { } while (0)
#endif
/*
handle->inode->i_flags |= EXT4_EXTENTS_FL;
}
- if (!(handle->inode->i_flags & EXT4_EXTENTS_FL))
- return EXT2_ET_INODE_NOT_EXTENT;
+ if (!(handle->inode->i_flags & EXT4_EXTENTS_FL)) {
+ retval = EXT2_ET_INODE_NOT_EXTENT;
+ goto errout;
+ }
retval = ext2fs_extent_header_verify(eh, sizeof(handle->inode->i_block));
if (retval)
- return (retval);
+ goto errout;
handle->max_depth = ext2fs_le16_to_cpu(eh->eh_depth);
handle->type = ext2fs_le16_to_cpu(eh->eh_magic);
return EXT2_ET_EXTENT_NO_NEXT;
}
if (op != EXT2_EXTENT_NEXT_SIB) {
- dbg_printf("<<<< OP = %s\n",
+#ifdef DEBUG
+ printf("<<<< OP = %s\n",
(op == EXT2_EXTENT_DOWN) ? "down" :
((op == EXT2_EXTENT_UP) ? "up" : "unknown"));
+#endif
}
}
return EXT2_ET_EXTENT_NO_PREV;
}
if (op != EXT2_EXTENT_PREV_SIB) {
- dbg_printf("<<<< OP = %s\n",
+#ifdef DEBUG
+ printf("<<<< OP = %s\n",
(op == EXT2_EXTENT_DOWN_AND_LAST) ? "down/last" :
((op == EXT2_EXTENT_UP) ? "up" : "unknown"));
+#endif
}
}
op = EXT2_EXTENT_DOWN;
else
op = EXT2_EXTENT_LAST_SIB;
- dbg_printf("<<<< OP = %s\n",
+#ifdef DEBUG
+ printf("<<<< OP = %s\n",
(op == EXT2_EXTENT_DOWN) ? "down" : "last_sib");
+#endif
}
switch (op) {
if (handle->level < handle->max_depth)
path->visit_num = 1;
}
-
- dbg_printf("Down to level %d/%d, end_blk=%llu\n",
+#ifdef DEBUG
+ printf("Down to level %d/%d, end_blk=%llu\n",
handle->level, handle->max_depth,
path->end_blk);
-
+#endif
break;
default:
return EXT2_ET_OP_NOT_SUPPORTED;
return EXT2_ET_NO_CURRENT_NODE;
extent->e_flags = 0;
- dbg_printf("(Left %d)\n", path->left);
+#ifdef DEBUG
+ printf("(Left %d)\n", path->left);
+#endif
if (handle->level == handle->max_depth) {
ex = (struct ext3_extent *) ix;
return retval;
if (leaf_level > handle->max_depth) {
- dbg_printf("leaf level %d greater than tree depth %d\n",
+#ifdef DEBUG
+ printf("leaf level %d greater than tree depth %d\n",
leaf_level, handle->max_depth);
+#endif
return EXT2_ET_OP_NOT_SUPPORTED;
}
if (!handle->path)
return EXT2_ET_NO_CURRENT_NODE;
- dbg_printf("splitting node at level %d\n", handle->level);
-
+#ifdef DEBUG
+ printf("splitting node at level %d\n", handle->level);
+#endif
retval = ext2fs_extent_get(handle, EXT2_EXTENT_CURRENT, &extent);
if (retval)
goto done;
(handle->path[handle->level - 1].entries >=
handle->path[handle->level - 1].max_entries)) {
- dbg_printf("parent level %d full; splitting it too\n",
+#ifdef DEBUG
+ printf("parent level %d full; splitting it too\n",
handle->level - 1);
+#endif
/* split the parent */
retval = ext2fs_extent_get(handle, EXT2_EXTENT_UP, &extent);
if (retval)
tocopy = ext2fs_le16_to_cpu(eh->eh_entries) / 2;
}
- dbg_printf("will copy out %d of %d entries at level %d\n",
+#ifdef DEBUG
+ printf("will copy out %d of %d entries at level %d\n",
tocopy, ext2fs_le16_to_cpu(eh->eh_entries),
handle->level);
+#endif
if (!tocopy) {
- dbg_printf("Nothing to copy to new block!\n");
+#ifdef DEBUG
+ printf("Nothing to copy to new block!\n");
+#endif
retval = EXT2_ET_CANT_SPLIT_EXTENT;
goto done;
}
if (retval)
goto done;
- dbg_printf("will copy to new node at block %lu\n", new_node_pblk);
+#ifdef DEBUG
+ printf("will copy to new node at block %lu\n", new_node_pblk);
+#endif
/* Copy data into new block buffer */
/* First the header for the new block... */
if (flags & EXT2_EXTENT_INSERT_NOSPLIT) {
return EXT2_ET_CANT_INSERT_EXTENT;
} else {
- dbg_printf("node full (level %d) - splitting\n",
+#ifdef DEBUG
+ printf("node full (level %d) - splitting\n",
handle->level);
+#endif
retval = extent_node_split(handle);
if (retval)
goto errout;
retval = 0;
mapped = 0;
if (!physical) {
- dbg_printf("block %llu already unmapped\n",
+#ifdef DEBUG
+ printf("block %llu already unmapped\n",
logical);
+#endif
goto done;
}
} else
/* check if already pointing to the requested physical */
if (mapped && (new_uninit == extent_uninit) &&
(extent.e_pblk + (logical - extent.e_lblk) == physical)) {
- dbg_printf("physical block (at %llu) unchanged\n", logical);
+#ifdef DEBUG
+ printf("physical block (at %llu) unchanged\n", logical);
+#endif
goto done;
}
if (!mapped) {
- dbg_printf("mapping unmapped logical block %llu\n", logical);
+#ifdef DEBUG
+ printf("mapping unmapped logical block %llu\n", logical);
+#endif
if ((logical == extent.e_lblk + extent.e_len) &&
(physical == extent.e_pblk + extent.e_len) &&
(new_uninit == extent_uninit) &&
((int) extent.e_len < max_len-1)) {
extent.e_len++;
retval = ext2fs_extent_replace(handle, 0, &extent);
- } else
+ } else if (logical < extent.e_lblk)
+ retval = ext2fs_extent_insert(handle, 0, &newextent);
+ else
retval = ext2fs_extent_insert(handle,
EXT2_EXTENT_INSERT_AFTER, &newextent);
if (retval)
if (retval)
goto done;
} else if ((logical == extent.e_lblk) && (extent.e_len == 1)) {
- dbg_printf("(re/un)mapping only block in extent\n");
+#ifdef DEBUG
+ printf("(re/un)mapping only block in extent\n");
+#endif
if (physical) {
extent.e_pblk = physical;
retval = ext2fs_extent_replace(handle, 0, &extent);
if (retval)
goto done;
} else if (logical == extent.e_lblk + extent.e_len - 1) {
- dbg_printf("(re/un)mapping last block in extent\n");
+#ifdef DEBUG
+ printf("(re/un)mapping last block in extent\n");
+#endif
extent.e_len--;
retval = ext2fs_extent_replace(handle, 0, &extent);
if (retval)
goto done;
}
} else if (logical == extent.e_lblk) {
- dbg_printf("(re/un)mapping first block in extent\n");
+#ifdef DEBUG
+ printf("(re/un)mapping first block in extent\n");
+#endif
extent.e_pblk++;
extent.e_lblk++;
extent.e_len--;
} else {
__u32 orig_length;
- dbg_printf("(re/un)mapping in middle of extent\n");
+#ifdef DEBUG
+ printf("(re/un)mapping in middle of extent\n");
+#endif
/* need to split this extent; later */
orig_length = extent.e_len;
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff