We can't use ext2_dir_entry_2 typecast on big endian machines directly.
The bytes do not get converted during extX block read due to missing
flag EXT2_DIRBLOCK_V2_STRUCT passed down to ext2fs_read_dir_block4 from
ext2fs_process_dir_block. Fixing on the ext2 side needs updating callers
and (maybe) the library interfaces. We'll fix it on the convert side for
now.
CC: Jan Kara <jack@xxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxx>
---
convert.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/convert.c b/convert.c
index 400488e..7766c09 100644
--- a/convert.c
+++ b/convert.c
@@ -264,10 +264,13 @@ static int dir_iterate_proc(ext2_ino_t dir, int entry,
struct btrfs_key location;
struct ext2_dir_entry_2 *dirent = (struct ext2_dir_entry_2 *)old;
struct dir_iterate_data *idata = (struct dir_iterate_data *)priv_data;
+ int name_len;
+
+ name_len = old->name_len & 0xFF;
objectid = dirent->inode + INO_OFFSET;
- if (!strncmp(dirent->name, dotdot, dirent->name_len)) {
- if (dirent->name_len == 2) {
+ if (!strncmp(dirent->name, dotdot, name_len)) {
+ if (name_len == 2) {
BUG_ON(idata->parent != 0);
idata->parent = objectid;
}
@@ -280,7 +283,7 @@ static int dir_iterate_proc(ext2_ino_t dir, int entry,
location.offset = 0;
btrfs_set_key_type(&location, BTRFS_INODE_ITEM_KEY);
- file_type = dirent->file_type;
+ file_type = old->name_len >> 8;
BUG_ON(file_type > EXT2_FT_SYMLINK);
ret = btrfs_insert_dir_item(idata->trans, idata->root,
dirent->name, dirent->name_len,
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
