Whamcloud - gitweb
Merge branch 'maint' into next
[tools/e2fsprogs.git] / lib / ext2fs / swapfs.c
index 45e87ba..bc9f323 100644 (file)
 /*
  * swapfs.c --- swap ext2 filesystem data structures
- * 
- * Copyright (C) 1995, 1996 Theodore Ts'o.
+ *
+ * Copyright (C) 1995, 1996, 2002 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <string.h>
 #include <time.h>
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
-#endif
-
 #include "ext2fs.h"
+#include "ext2fsP.h"
+#include <ext2fs/ext2_ext_attr.h>
 
-void ext2fs_swap_super(struct ext2_super_block * super)
+void ext2fs_swap_super(struct ext2_super_block * sb)
 {
-       struct ext2fs_sb *s = (struct ext2fs_sb *) super;
-       
-       super->s_inodes_count = ext2fs_swab32(super->s_inodes_count);
-       super->s_blocks_count = ext2fs_swab32(super->s_blocks_count);
-       super->s_r_blocks_count = ext2fs_swab32(super->s_r_blocks_count);
-       super->s_free_blocks_count = ext2fs_swab32(super->s_free_blocks_count);
-       super->s_free_inodes_count = ext2fs_swab32(super->s_free_inodes_count);
-       super->s_first_data_block = ext2fs_swab32(super->s_first_data_block);
-       super->s_log_block_size = ext2fs_swab32(super->s_log_block_size);
-       super->s_log_frag_size = ext2fs_swab32(super->s_log_frag_size);
-       super->s_blocks_per_group = ext2fs_swab32(super->s_blocks_per_group);
-       super->s_frags_per_group = ext2fs_swab32(super->s_frags_per_group);
-       super->s_inodes_per_group = ext2fs_swab32(super->s_inodes_per_group);
-       super->s_mtime = ext2fs_swab32(super->s_mtime);
-       super->s_wtime = ext2fs_swab32(super->s_wtime);
-       super->s_mnt_count = ext2fs_swab16(super->s_mnt_count);
-       super->s_max_mnt_count = ext2fs_swab16(super->s_max_mnt_count);
-       super->s_magic = ext2fs_swab16(super->s_magic);
-       super->s_state = ext2fs_swab16(super->s_state);
-       super->s_errors = ext2fs_swab16(super->s_errors);
-       s->s_minor_rev_level = ext2fs_swab16(s->s_minor_rev_level);
-       super->s_lastcheck = ext2fs_swab32(super->s_lastcheck);
-       super->s_checkinterval = ext2fs_swab32(super->s_checkinterval);
-       super->s_creator_os = ext2fs_swab32(super->s_creator_os);
-       super->s_rev_level = ext2fs_swab32(super->s_rev_level);
-#ifdef EXT2_DEF_RESUID
-       super->s_def_resuid = ext2fs_swab16(super->s_def_resuid);
-       super->s_def_resgid = ext2fs_swab16(super->s_def_resgid);
-#endif
-       s->s_first_ino = ext2fs_swab32(s->s_first_ino);
-       s->s_inode_size = ext2fs_swab16(s->s_inode_size);
-       s->s_block_group_nr = ext2fs_swab16(s->s_block_group_nr);
-       s->s_feature_compat = ext2fs_swab32(s->s_feature_compat);
-       s->s_feature_incompat = ext2fs_swab32(s->s_feature_incompat);
-       s->s_feature_ro_compat = ext2fs_swab32(s->s_feature_ro_compat);
-       s->s_algorithm_usage_bitmap = ext2fs_swab32(s->s_algorithm_usage_bitmap);
-       s->s_journal_inum = ext2fs_swab32(s->s_journal_inum);
-       s->s_journal_dev = ext2fs_swab32(s->s_journal_dev);
-       s->s_last_orphan = ext2fs_swab32(s->s_last_orphan);
+       int i;
+
+       sb->s_inodes_count = ext2fs_swab32(sb->s_inodes_count);
+       sb->s_blocks_count = ext2fs_swab32(sb->s_blocks_count);
+       sb->s_r_blocks_count = ext2fs_swab32(sb->s_r_blocks_count);
+       sb->s_free_blocks_count = ext2fs_swab32(sb->s_free_blocks_count);
+       sb->s_free_inodes_count = ext2fs_swab32(sb->s_free_inodes_count);
+       sb->s_first_data_block = ext2fs_swab32(sb->s_first_data_block);
+       sb->s_log_block_size = ext2fs_swab32(sb->s_log_block_size);
+       sb->s_log_cluster_size = ext2fs_swab32(sb->s_log_cluster_size);
+       sb->s_blocks_per_group = ext2fs_swab32(sb->s_blocks_per_group);
+       sb->s_clusters_per_group = ext2fs_swab32(sb->s_clusters_per_group);
+       sb->s_inodes_per_group = ext2fs_swab32(sb->s_inodes_per_group);
+       sb->s_mtime = ext2fs_swab32(sb->s_mtime);
+       sb->s_wtime = ext2fs_swab32(sb->s_wtime);
+       sb->s_mnt_count = ext2fs_swab16(sb->s_mnt_count);
+       sb->s_max_mnt_count = ext2fs_swab16(sb->s_max_mnt_count);
+       sb->s_magic = ext2fs_swab16(sb->s_magic);
+       sb->s_state = ext2fs_swab16(sb->s_state);
+       sb->s_errors = ext2fs_swab16(sb->s_errors);
+       sb->s_minor_rev_level = ext2fs_swab16(sb->s_minor_rev_level);
+       sb->s_lastcheck = ext2fs_swab32(sb->s_lastcheck);
+       sb->s_checkinterval = ext2fs_swab32(sb->s_checkinterval);
+       sb->s_creator_os = ext2fs_swab32(sb->s_creator_os);
+       sb->s_rev_level = ext2fs_swab32(sb->s_rev_level);
+       sb->s_def_resuid = ext2fs_swab16(sb->s_def_resuid);
+       sb->s_def_resgid = ext2fs_swab16(sb->s_def_resgid);
+       sb->s_first_ino = ext2fs_swab32(sb->s_first_ino);
+       sb->s_inode_size = ext2fs_swab16(sb->s_inode_size);
+       sb->s_block_group_nr = ext2fs_swab16(sb->s_block_group_nr);
+       sb->s_feature_compat = ext2fs_swab32(sb->s_feature_compat);
+       sb->s_feature_incompat = ext2fs_swab32(sb->s_feature_incompat);
+       sb->s_feature_ro_compat = ext2fs_swab32(sb->s_feature_ro_compat);
+       /* sb->s_uuid is __u8 and does not need swabbing */
+       /* sb->s_volume_name is char and does not need swabbing */
+       /* sb->s_last_mounted is char and does not need swabbing */
+       sb->s_algorithm_usage_bitmap = ext2fs_swab32(sb->s_algorithm_usage_bitmap);
+       /* sb->s_prealloc_blocks is __u8 and does not need swabbing */
+       /* sb->s_prealloc_dir_blocks is __u8 and does not need swabbing */
+       sb->s_reserved_gdt_blocks = ext2fs_swab16(sb->s_reserved_gdt_blocks);
+       /* sb->s_journal_uuid is __u8 and does not need swabbing */
+       sb->s_journal_inum = ext2fs_swab32(sb->s_journal_inum);
+       sb->s_journal_dev = ext2fs_swab32(sb->s_journal_dev);
+       sb->s_last_orphan = ext2fs_swab32(sb->s_last_orphan);
+       for (i = 0; i < 4; i++)
+               sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]);
+       /* sb->s_def_hash_version is __u8 and does not need swabbing */
+       /* sb->s_jnl_backup_type is __u8 and does not need swabbing */
+       sb->s_desc_size = ext2fs_swab16(sb->s_desc_size);
+       sb->s_default_mount_opts = ext2fs_swab32(sb->s_default_mount_opts);
+       sb->s_first_meta_bg = ext2fs_swab32(sb->s_first_meta_bg);
+       sb->s_mkfs_time = ext2fs_swab32(sb->s_mkfs_time);
+       /* if journal backup is for a valid extent-based journal... */
+       if (ext2fs_extent_header_verify(sb->s_jnl_blocks,
+                                       sizeof(sb->s_jnl_blocks)) == 0) {
+               /* ... swap only the journal i_size and i_size_high,
+                * and the extent data is not swapped on read */
+               i = 15;
+       } else {
+               /* direct/indirect journal: swap it all */
+               i = 0;
+       }
+       for (; i < 17; i++)
+               sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]);
+       sb->s_blocks_count_hi = ext2fs_swab32(sb->s_blocks_count_hi);
+       sb->s_r_blocks_count_hi = ext2fs_swab32(sb->s_r_blocks_count_hi);
+       sb->s_free_blocks_hi = ext2fs_swab32(sb->s_free_blocks_hi);
+       sb->s_min_extra_isize = ext2fs_swab16(sb->s_min_extra_isize);
+       sb->s_want_extra_isize = ext2fs_swab16(sb->s_want_extra_isize);
+       sb->s_flags = ext2fs_swab32(sb->s_flags);
+       sb->s_raid_stride = ext2fs_swab16(sb->s_raid_stride);
+       sb->s_mmp_update_interval = ext2fs_swab16(sb->s_mmp_update_interval);
+       sb->s_mmp_block = ext2fs_swab64(sb->s_mmp_block);
+       sb->s_raid_stripe_width = ext2fs_swab32(sb->s_raid_stripe_width);
+       /* sb->s_log_groups_per_flex is __u8 and does not need swabbing */
+       /* sb->s_checksum_type is __u8 and does not need swabbing */
+       /* sb->s_encryption_level is __u8 and does not need swabbing */
+       /* sb->s_reserved_pad is __u8 and does not need swabbing */
+       sb->s_kbytes_written = ext2fs_swab64(sb->s_kbytes_written);
+       sb->s_snapshot_inum = ext2fs_swab32(sb->s_snapshot_inum);
+       sb->s_snapshot_id = ext2fs_swab32(sb->s_snapshot_id);
+       sb->s_snapshot_r_blocks_count =
+               ext2fs_swab64(sb->s_snapshot_r_blocks_count);
+       sb->s_snapshot_list = ext2fs_swab32(sb->s_snapshot_list);
+       sb->s_error_count = ext2fs_swab32(sb->s_error_count);
+       sb->s_first_error_time = ext2fs_swab32(sb->s_first_error_time);
+       sb->s_first_error_ino = ext2fs_swab32(sb->s_first_error_ino);
+       sb->s_first_error_block = ext2fs_swab64(sb->s_first_error_block);
+       /* sb->s_first_error_func is __u8 and does not need swabbing */
+       sb->s_last_error_time = ext2fs_swab32(sb->s_last_error_time);
+       sb->s_last_error_ino = ext2fs_swab32(sb->s_last_error_ino);
+       sb->s_last_error_block = ext2fs_swab64(sb->s_last_error_block);
+       /* sb->s_last_error_func is __u8 and does not need swabbing */
+       /* sb->s_mount_opts is __u8 and does not need swabbing */
+       sb->s_usr_quota_inum = ext2fs_swab32(sb->s_usr_quota_inum);
+       sb->s_grp_quota_inum = ext2fs_swab32(sb->s_grp_quota_inum);
+       sb->s_overhead_clusters = ext2fs_swab32(sb->s_overhead_clusters);
+       sb->s_backup_bgs[0] = ext2fs_swab32(sb->s_backup_bgs[0]);
+       sb->s_backup_bgs[1] = ext2fs_swab32(sb->s_backup_bgs[1]);
+       /* sb->s_encrypt_algos is __u8 and does not need swabbing */
+       /* sb->s_encrypt_pw_salt is __u8 and does not need swabbing */
+       sb->s_lpf_ino = ext2fs_swab32(sb->s_lpf_ino);
+       sb->s_prj_quota_inum = ext2fs_swab32(sb->s_prj_quota_inum);
+       sb->s_checksum_seed = ext2fs_swab32(sb->s_checksum_seed);
+       /* s_*_time_hi are __u8 and does not need swabbing */
+       sb->s_encoding = ext2fs_swab16(sb->s_encoding);
+       sb->s_encoding_flags = ext2fs_swab16(sb->s_encoding_flags);
+       /* catch when new fields are used from s_reserved */
+       EXT2FS_BUILD_BUG_ON(sizeof(sb->s_reserved) != 95 * sizeof(__le32));
+       sb->s_checksum = ext2fs_swab32(sb->s_checksum);
 }
 
-void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
+void ext2fs_swap_group_desc2(ext2_filsys fs, struct ext2_group_desc *gdp)
 {
+       struct ext4_group_desc *gdp4 = (struct ext4_group_desc *)gdp;
+
+       /* Do the 32-bit parts first */
        gdp->bg_block_bitmap = ext2fs_swab32(gdp->bg_block_bitmap);
        gdp->bg_inode_bitmap = ext2fs_swab32(gdp->bg_inode_bitmap);
        gdp->bg_inode_table = ext2fs_swab32(gdp->bg_inode_table);
        gdp->bg_free_blocks_count = ext2fs_swab16(gdp->bg_free_blocks_count);
        gdp->bg_free_inodes_count = ext2fs_swab16(gdp->bg_free_inodes_count);
        gdp->bg_used_dirs_count = ext2fs_swab16(gdp->bg_used_dirs_count);
+       gdp->bg_flags = ext2fs_swab16(gdp->bg_flags);
+       gdp->bg_exclude_bitmap_lo = ext2fs_swab32(gdp->bg_exclude_bitmap_lo);
+       gdp->bg_block_bitmap_csum_lo =
+               ext2fs_swab16(gdp->bg_block_bitmap_csum_lo);
+       gdp->bg_inode_bitmap_csum_lo =
+               ext2fs_swab16(gdp->bg_inode_bitmap_csum_lo);
+       gdp->bg_itable_unused = ext2fs_swab16(gdp->bg_itable_unused);
+       gdp->bg_checksum = ext2fs_swab16(gdp->bg_checksum);
+       /* If we're 32-bit, we're done */
+       if (fs == NULL || EXT2_DESC_SIZE(fs->super) < EXT2_MIN_DESC_SIZE_64BIT)
+               return;
+
+       /* Swap the 64-bit parts */
+       gdp4->bg_block_bitmap_hi = ext2fs_swab32(gdp4->bg_block_bitmap_hi);
+       gdp4->bg_inode_bitmap_hi = ext2fs_swab32(gdp4->bg_inode_bitmap_hi);
+       gdp4->bg_inode_table_hi = ext2fs_swab32(gdp4->bg_inode_table_hi);
+       gdp4->bg_free_blocks_count_hi =
+               ext2fs_swab16(gdp4->bg_free_blocks_count_hi);
+       gdp4->bg_free_inodes_count_hi =
+               ext2fs_swab16(gdp4->bg_free_inodes_count_hi);
+       gdp4->bg_used_dirs_count_hi =
+               ext2fs_swab16(gdp4->bg_used_dirs_count_hi);
+       gdp4->bg_itable_unused_hi = ext2fs_swab16(gdp4->bg_itable_unused_hi);
+       gdp4->bg_exclude_bitmap_hi = ext2fs_swab16(gdp4->bg_exclude_bitmap_hi);
+       gdp4->bg_block_bitmap_csum_hi =
+               ext2fs_swab16(gdp4->bg_block_bitmap_csum_hi);
+       gdp4->bg_inode_bitmap_csum_hi =
+               ext2fs_swab16(gdp4->bg_inode_bitmap_csum_hi);
+       EXT2FS_BUILD_BUG_ON(sizeof(gdp4->bg_reserved) != sizeof(__u32));
 }
 
-void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
-                      struct ext2_inode *f, int hostorder)
+void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
+{
+       ext2fs_swap_group_desc2(0, gdp);
+}
+
+
+void ext2fs_swap_ext_attr_header(struct ext2_ext_attr_header *to_header,
+                                struct ext2_ext_attr_header *from_header)
+{
+       int n;
+
+       to_header->h_magic    = ext2fs_swab32(from_header->h_magic);
+       to_header->h_blocks   = ext2fs_swab32(from_header->h_blocks);
+       to_header->h_refcount = ext2fs_swab32(from_header->h_refcount);
+       to_header->h_hash     = ext2fs_swab32(from_header->h_hash);
+       to_header->h_checksum = ext2fs_swab32(from_header->h_checksum);
+       for (n = 0; n < 3; n++)
+               to_header->h_reserved[n] =
+                       ext2fs_swab32(from_header->h_reserved[n]);
+}
+
+void ext2fs_swap_ext_attr_entry(struct ext2_ext_attr_entry *to_entry,
+                               struct ext2_ext_attr_entry *from_entry)
 {
-       unsigned i;
-       int islnk = 0;
-       
-       if (hostorder && LINUX_S_ISLNK(f->i_mode))
-               islnk = 1;
+       to_entry->e_value_offs  = ext2fs_swab16(from_entry->e_value_offs);
+       to_entry->e_value_inum  = ext2fs_swab32(from_entry->e_value_inum);
+       to_entry->e_value_size  = ext2fs_swab32(from_entry->e_value_size);
+       to_entry->e_hash        = ext2fs_swab32(from_entry->e_hash);
+}
+
+void ext2fs_swap_ext_attr(char *to, char *from, int bufsize, int has_header)
+{
+       struct ext2_ext_attr_header *from_header =
+               (struct ext2_ext_attr_header *)from;
+       struct ext2_ext_attr_header *to_header =
+               (struct ext2_ext_attr_header *)to;
+       struct ext2_ext_attr_entry *from_entry, *to_entry;
+       char *from_end = (char *)from_header + bufsize;
+
+       if (to_header != from_header)
+               memcpy(to_header, from_header, bufsize);
+
+       if (has_header) {
+               ext2fs_swap_ext_attr_header(to_header, from_header);
+
+               from_entry = (struct ext2_ext_attr_entry *)(from_header+1);
+               to_entry   = (struct ext2_ext_attr_entry *)(to_header+1);
+       } else {
+               from_entry = (struct ext2_ext_attr_entry *)from_header;
+               to_entry   = (struct ext2_ext_attr_entry *)to_header;
+       }
+
+       while ((char *)from_entry < from_end &&
+              (char *)EXT2_EXT_ATTR_NEXT(from_entry) <= from_end &&
+              *(__u32 *)from_entry) {
+               ext2fs_swap_ext_attr_entry(to_entry, from_entry);
+               from_entry = EXT2_EXT_ATTR_NEXT(from_entry);
+               to_entry   = EXT2_EXT_ATTR_NEXT(to_entry);
+       }
+}
+
+void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
+                           struct ext2_inode_large *f, int hostorder,
+                           int bufsize)
+{
+       unsigned i, extra_isize, attr_magic;
+       int has_extents, has_inline_data, islnk, fast_symlink;
+       int inode_size;
+       __u32 *eaf, *eat;
+
+       /*
+        * Note that t and f may point to the same address. That's why
+        * if (hostorder) condition is executed before swab calls and
+        * if (!hostorder) afterwards.
+        */
+       if (hostorder) {
+               islnk = LINUX_S_ISLNK(f->i_mode);
+               fast_symlink = ext2fs_is_fast_symlink(EXT2_INODE(f));
+               has_extents = (f->i_flags & EXT4_EXTENTS_FL) != 0;
+               has_inline_data = (f->i_flags & EXT4_INLINE_DATA_FL) != 0;
+       }
+
        t->i_mode = ext2fs_swab16(f->i_mode);
-       if (!hostorder && LINUX_S_ISLNK(t->i_mode))
-               islnk = 1;
        t->i_uid = ext2fs_swab16(f->i_uid);
        t->i_size = ext2fs_swab32(f->i_size);
        t->i_atime = ext2fs_swab32(f->i_atime);
@@ -95,9 +269,22 @@ void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
        t->i_dtime = ext2fs_swab32(f->i_dtime);
        t->i_gid = ext2fs_swab16(f->i_gid);
        t->i_links_count = ext2fs_swab16(f->i_links_count);
+       t->i_file_acl = ext2fs_swab32(f->i_file_acl);
        t->i_blocks = ext2fs_swab32(f->i_blocks);
        t->i_flags = ext2fs_swab32(f->i_flags);
-       if (!islnk || f->i_blocks) {
+       t->i_size_high = ext2fs_swab32(f->i_size_high);
+
+       if (!hostorder) {
+               islnk = LINUX_S_ISLNK(t->i_mode);
+               fast_symlink = ext2fs_is_fast_symlink(EXT2_INODE(t));
+               has_extents = (t->i_flags & EXT4_EXTENTS_FL) != 0;
+               has_inline_data = (t->i_flags & EXT4_INLINE_DATA_FL) != 0;
+       }
+
+       /*
+        * Extent data and inline data are swapped on access, not here
+        */
+       if (!has_extents && !has_inline_data && (!islnk || !fast_symlink)) {
                for (i = 0; i < EXT2_N_BLOCKS; i++)
                        t->i_block[i] = ext2fs_swab32(f->i_block[i]);
        } else if (t != f) {
@@ -105,23 +292,22 @@ void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
                        t->i_block[i] = f->i_block[i];
        }
        t->i_generation = ext2fs_swab32(f->i_generation);
-       t->i_file_acl = ext2fs_swab32(f->i_file_acl);
-       t->i_dir_acl = ext2fs_swab32(f->i_dir_acl);
        t->i_faddr = ext2fs_swab32(f->i_faddr);
 
        switch (fs->super->s_creator_os) {
        case EXT2_OS_LINUX:
-               t->osd1.linux1.l_i_reserved1 =
-                       ext2fs_swab32(f->osd1.linux1.l_i_reserved1);
-               t->osd2.linux2.l_i_frag = f->osd2.linux2.l_i_frag;
-               t->osd2.linux2.l_i_fsize = f->osd2.linux2.l_i_fsize;
-               t->osd2.linux2.i_pad1 = ext2fs_swab16(f->osd2.linux2.i_pad1);
+               t->osd1.linux1.l_i_version =
+                       ext2fs_swab32(f->osd1.linux1.l_i_version);
+               t->osd2.linux2.l_i_blocks_hi =
+                       ext2fs_swab16(f->osd2.linux2.l_i_blocks_hi);
+               t->osd2.linux2.l_i_file_acl_high =
+                       ext2fs_swab16(f->osd2.linux2.l_i_file_acl_high);
                t->osd2.linux2.l_i_uid_high =
                  ext2fs_swab16 (f->osd2.linux2.l_i_uid_high);
                t->osd2.linux2.l_i_gid_high =
                  ext2fs_swab16 (f->osd2.linux2.l_i_gid_high);
-               t->osd2.linux2.l_i_reserved2 =
-                       ext2fs_swab32(f->osd2.linux2.l_i_reserved2);
+               t->osd2.linux2.l_i_checksum_lo =
+                       ext2fs_swab16(f->osd2.linux2.l_i_checksum_lo);
                break;
        case EXT2_OS_HURD:
                t->osd1.hurd1.h_i_translator =
@@ -137,17 +323,165 @@ void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
                t->osd2.hurd2.h_i_author =
                  ext2fs_swab32 (f->osd2.hurd2.h_i_author);
                break;
-       case EXT2_OS_MASIX:
-               t->osd1.masix1.m_i_reserved1 =
-                       ext2fs_swab32(f->osd1.masix1.m_i_reserved1);
-               t->osd2.masix2.m_i_frag = f->osd2.masix2.m_i_frag;
-               t->osd2.masix2.m_i_fsize = f->osd2.masix2.m_i_fsize;
-               t->osd2.masix2.m_pad1 = ext2fs_swab16(f->osd2.masix2.m_pad1);
-               t->osd2.masix2.m_i_reserved2[0] =
-                       ext2fs_swab32(f->osd2.masix2.m_i_reserved2[0]);
-               t->osd2.masix2.m_i_reserved2[1] =
-                       ext2fs_swab32(f->osd2.masix2.m_i_reserved2[1]);
+       default:
                break;
        }
+
+       if (bufsize < (int) (sizeof(struct ext2_inode) + sizeof(__u16)))
+               return; /* no i_extra_isize field */
+
+       if (hostorder)
+               extra_isize = f->i_extra_isize;
+       t->i_extra_isize = ext2fs_swab16(f->i_extra_isize);
+       if (!hostorder)
+               extra_isize = t->i_extra_isize;
+       if (extra_isize > EXT2_INODE_SIZE(fs->super) -
+                               sizeof(struct ext2_inode)) {
+               /* this is error case: i_extra_size is too large */
+               return;
+       }
+       if (extra_isize & 3)
+               return;         /* Illegal inode extra_isize */
+
+       inode_size = EXT2_GOOD_OLD_INODE_SIZE + extra_isize;
+       if (inode_includes(inode_size, i_checksum_hi))
+               t->i_checksum_hi = ext2fs_swab16(f->i_checksum_hi);
+       if (inode_includes(inode_size, i_ctime_extra))
+               t->i_ctime_extra = ext2fs_swab32(f->i_ctime_extra);
+       if (inode_includes(inode_size, i_mtime_extra))
+               t->i_mtime_extra = ext2fs_swab32(f->i_mtime_extra);
+       if (inode_includes(inode_size, i_atime_extra))
+               t->i_atime_extra = ext2fs_swab32(f->i_atime_extra);
+       if (inode_includes(inode_size, i_crtime))
+               t->i_crtime = ext2fs_swab32(f->i_crtime);
+       if (inode_includes(inode_size, i_crtime_extra))
+               t->i_crtime_extra = ext2fs_swab32(f->i_crtime_extra);
+       if (inode_includes(inode_size, i_version_hi))
+               t->i_version_hi = ext2fs_swab32(f->i_version_hi);
+       if (inode_includes(inode_size, i_projid))
+                t->i_projid = ext2fs_swab32(f->i_projid);
+       /* catch new static fields added after i_projid */
+       EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160);
+
+       i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32);
+       if (bufsize < (int) i)
+               return; /* no space for EA magic */
+
+       eaf = (__u32 *) (((char *) f) + sizeof(struct ext2_inode) +
+                                       extra_isize);
+
+       attr_magic = *eaf;
+       if (!hostorder)
+               attr_magic = ext2fs_swab32(attr_magic);
+
+       if (attr_magic != EXT2_EXT_ATTR_MAGIC)
+               return; /* it seems no magic here */
+
+       eat = (__u32 *) (((char *) t) + sizeof(struct ext2_inode) +
+                                       extra_isize);
+       *eat = ext2fs_swab32(*eaf);
+
+       /* convert EA(s) */
+       ext2fs_swap_ext_attr((char *) (eat + 1), (char *) (eaf + 1),
+                            bufsize - sizeof(struct ext2_inode) -
+                            extra_isize - sizeof(__u32), 0);
+
+}
+
+void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
+                      struct ext2_inode *f, int hostorder)
+{
+       ext2fs_swap_inode_full(fs, (struct ext2_inode_large *) t,
+                               (struct ext2_inode_large *) f, hostorder,
+                               sizeof(struct ext2_inode));
+}
+
+void ext2fs_swap_mmp(struct mmp_struct *mmp)
+{
+       mmp->mmp_magic = ext2fs_swab32(mmp->mmp_magic);
+       mmp->mmp_seq = ext2fs_swab32(mmp->mmp_seq);
+       mmp->mmp_time = ext2fs_swab64(mmp->mmp_time);
+       mmp->mmp_check_interval = ext2fs_swab16(mmp->mmp_check_interval);
+       mmp->mmp_checksum = ext2fs_swab32(mmp->mmp_checksum);
+}
+
+errcode_t ext2fs_dirent_swab_in(ext2_filsys fs, char *buf, int flags)
+{
+       return ext2fs_dirent_swab_in2(fs, buf, fs->blocksize, flags);
+}
+
+errcode_t ext2fs_dirent_swab_in2(ext2_filsys fs, char *buf,
+                                size_t size, int flags)
+{
+       errcode_t       retval;
+       char            *p, *end;
+       struct ext2_dir_entry *dirent;
+       unsigned int    name_len, rec_len, left;
+
+       p = (char *) buf;
+       end = (char *) buf + size;
+       left = size;
+       while (p < end-8) {
+               dirent = (struct ext2_dir_entry *) p;
+               dirent->inode = ext2fs_swab32(dirent->inode);
+               dirent->rec_len = ext2fs_swab16(dirent->rec_len);
+               dirent->name_len = ext2fs_swab16(dirent->name_len);
+               name_len = dirent->name_len;
+               if (flags & EXT2_DIRBLOCK_V2_STRUCT)
+                       dirent->name_len = ext2fs_swab16(dirent->name_len);
+               retval = ext2fs_get_rec_len(fs, dirent, &rec_len);
+               if (retval)
+                       return retval;
+               if ((rec_len < 8) || (rec_len % 4)) {
+                       rec_len = 8;
+                       retval = EXT2_ET_DIR_CORRUPTED;
+               } else if (((name_len & 0xFF) + 8) > rec_len)
+                       retval = EXT2_ET_DIR_CORRUPTED;
+               if (rec_len > left)
+                       return EXT2_ET_DIR_CORRUPTED;
+               left -= rec_len;
+               p += rec_len;
+       }
+
+       return 0;
+}
+
+errcode_t ext2fs_dirent_swab_out(ext2_filsys fs, char *buf, int flags)
+{
+       return ext2fs_dirent_swab_out2(fs, buf, fs->blocksize, flags);
+}
+
+errcode_t ext2fs_dirent_swab_out2(ext2_filsys fs, char *buf,
+                                 size_t size, int flags)
+{
+       errcode_t       retval;
+       char            *p, *end;
+       unsigned int    rec_len;
+       struct ext2_dir_entry *dirent;
+
+       p = buf;
+       end = buf + size;
+       while (p < end) {
+               dirent = (struct ext2_dir_entry *) p;
+               retval = ext2fs_get_rec_len(fs, dirent, &rec_len);
+               if (retval)
+                       return retval;
+               if ((rec_len < 8) ||
+                   (rec_len % 4)) {
+                       ext2fs_free_mem(&buf);
+                       return EXT2_ET_DIR_CORRUPTED;
+               }
+               p += rec_len;
+               dirent->inode = ext2fs_swab32(dirent->inode);
+               dirent->rec_len = ext2fs_swab16(dirent->rec_len);
+               dirent->name_len = ext2fs_swab16(dirent->name_len);
+               if (rec_len > size)
+                       return EXT2_ET_DIR_CORRUPTED;
+               size -= rec_len;
+
+               if (flags & EXT2_DIRBLOCK_V2_STRUCT)
+                       dirent->name_len = ext2fs_swab16(dirent->name_len);
+       }
+
+       return 0;
 }
-