]> git.ipfire.org Git - thirdparty/e2fsprogs.git/blobdiff - lib/ext2fs/swapfs.c
Shorten compile commands run by the build system
[thirdparty/e2fsprogs.git] / lib / ext2fs / swapfs.c
index 6576c5959c30579caa1d3c9ce028530fe6f63674..bc6d569d68106dcecddcbe6d451c4a11dd4c1eda 100644 (file)
@@ -1,14 +1,15 @@
 /*
  * swapfs.c --- swap ext2 filesystem data structures
- * 
+ *
  * 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>
@@ -20,7 +21,7 @@
 #include "ext2fs.h"
 #include <ext2fs/ext2_ext_attr.h>
 
-#ifdef EXT2FS_ENABLE_SWAPFS
+#ifdef WORDS_BIGENDIAN
 void ext2fs_swap_super(struct ext2_super_block * sb)
 {
        int i;
@@ -31,9 +32,9 @@ void ext2fs_swap_super(struct ext2_super_block * sb)
        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_frag_size = ext2fs_swab32(sb->s_log_frag_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_frags_per_group = ext2fs_swab32(sb->s_frags_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);
@@ -70,15 +71,37 @@ void ext2fs_swap_super(struct ext2_super_block * sb)
        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_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_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_blocks = ext2fs_swab32(sb->s_overhead_blocks);
+       sb->s_checksum = ext2fs_swab32(sb->s_checksum);
+
        for (i=0; i < 4; i++)
                sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]);
-       for (i=0; i < 17; i++)
-               sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]);
 
+       /* 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]);
 }
 
-void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
+void ext2fs_swap_group_desc2(ext2_filsys fs, struct ext2_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);
@@ -86,8 +109,64 @@ void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
        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 && (!fs->super->s_desc_size ||
+                  (fs->super->s_desc_size < EXT2_MIN_DESC_SIZE_64BIT)))
+               return;
+
+       /* Swap the 64-bit parts */
+       struct ext4_group_desc *gdp4 = (struct ext4_group_desc *) gdp;
+       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);
+}
+
+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);
+       for (n = 0; n < 4; 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)
+{
+       to_entry->e_value_offs  = ext2fs_swab16(from_entry->e_value_offs);
+       to_entry->e_value_block = ext2fs_swab32(from_entry->e_value_block);
+       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)
@@ -98,32 +177,22 @@ void ext2fs_swap_ext_attr(char *to, char *from, int bufsize, int has_header)
                (struct ext2_ext_attr_header *)to;
        struct ext2_ext_attr_entry *from_entry, *to_entry;
        char *from_end = (char *)from_header + bufsize;
-       int n;
 
        if (to_header != from_header)
                memcpy(to_header, from_header, bufsize);
 
-       from_entry = (struct ext2_ext_attr_entry *)from_header;
-       to_entry   = (struct ext2_ext_attr_entry *)to_header;
-
        if (has_header) {
-               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);
-               for (n=0; n<4; n++)
-                       to_header->h_reserved[n] =
-                               ext2fs_swab32(from_header->h_reserved[n]);
+               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 && *(__u32 *)from_entry) {
-               to_entry->e_value_offs  =       
-                       ext2fs_swab16(from_entry->e_value_offs);
-               to_entry->e_value_block =       
-                       ext2fs_swab32(from_entry->e_value_block);
-               to_entry->e_value_size  =       
-                       ext2fs_swab32(from_entry->e_value_size);
+               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);
        }
@@ -133,7 +202,8 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
                            struct ext2_inode_large *f, int hostorder,
                            int bufsize)
 {
-       unsigned i, has_data_blocks, extra_isize;
+       unsigned i, has_data_blocks, extra_isize, attr_magic;
+       int has_extents = 0;
        int islnk = 0;
        __u32 *eaf, *eat;
 
@@ -152,15 +222,20 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
        t->i_links_count = ext2fs_swab16(f->i_links_count);
        t->i_file_acl = ext2fs_swab32(f->i_file_acl);
        if (hostorder)
-               has_data_blocks = ext2fs_inode_data_blocks(fs, 
+               has_data_blocks = ext2fs_inode_data_blocks(fs,
                                           (struct ext2_inode *) f);
        t->i_blocks = ext2fs_swab32(f->i_blocks);
        if (!hostorder)
-               has_data_blocks = ext2fs_inode_data_blocks(fs, 
+               has_data_blocks = ext2fs_inode_data_blocks(fs,
                                           (struct ext2_inode *) t);
+       if (hostorder && (f->i_flags & EXT4_EXTENTS_FL))
+               has_extents = 1;
        t->i_flags = ext2fs_swab32(f->i_flags);
+       if (!hostorder && (t->i_flags & EXT4_EXTENTS_FL))
+               has_extents = 1;
        t->i_dir_acl = ext2fs_swab32(f->i_dir_acl);
-       if (!islnk || has_data_blocks ) {
+       /* extent data are swapped on access, not here */
+       if (!has_extents && (!islnk || has_data_blocks)) {
                for (i = 0; i < EXT2_N_BLOCKS; i++)
                        t->i_block[i] = ext2fs_swab32(f->i_block[i]);
        } else if (t != f) {
@@ -174,15 +249,16 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
        case EXT2_OS_LINUX:
                t->osd1.linux1.l_i_version =
                        ext2fs_swab32(f->osd1.linux1.l_i_version);
-               t->osd2.linux2.l_i_blocks_hi = 
+               t->osd2.linux2.l_i_blocks_hi =
                        ext2fs_swab16(f->osd2.linux2.l_i_blocks_hi);
-               t->osd2.linux2.i_pad1 = ext2fs_swab16(f->osd2.linux2.i_pad1);
+               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_swab32(f->osd2.linux2.l_i_checksum_lo);
                break;
        case EXT2_OS_HURD:
                t->osd1.hurd1.h_i_translator =
@@ -198,16 +274,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *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;
        }
 
@@ -225,6 +292,23 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
                return;
        }
 
+       if (extra_isize >= 2)
+               t->i_checksum_hi = ext2fs_swab16(f->i_checksum_hi);
+       if (extra_isize >= 6)
+               t->i_checksum_hi = ext2fs_swab32(f->i_checksum_hi);
+       if (extra_isize >= 10)
+               t->i_ctime_extra = ext2fs_swab32(f->i_ctime_extra);
+       if (extra_isize >= 14)
+               t->i_mtime_extra = ext2fs_swab32(f->i_mtime_extra);
+       if (extra_isize >= 18)
+               t->i_atime_extra = ext2fs_swab32(f->i_atime_extra);
+       if (extra_isize >= 22)
+               t->i_crtime = ext2fs_swab32(f->i_crtime);
+       if (extra_isize >= 26)
+               t->i_crtime_extra = ext2fs_swab32(f->i_crtime_extra);
+       if (extra_isize >= 30)
+               t->i_version_hi = ext2fs_swab32(f->i_version_hi);
+
        i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32);
        if (bufsize < (int) i)
                return; /* no space for EA magic */
@@ -232,7 +316,11 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
        eaf = (__u32 *) (((char *) f) + sizeof(struct ext2_inode) +
                                        extra_isize);
 
-       if (ext2fs_swab32(*eaf) != EXT2_EXT_ATTR_MAGIC)
+       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) +