From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 6 Jan 2020 23:01:48 +0000 (-0500)
Subject: libext2fs: always compile swapfs functions on all architectures
X-Git-Tag: v1.45.5~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=01517f6ea1347e0ce176e4e1a88855bb70f7a547;p=tools%2Fe2fsprogs.git

libext2fs: always compile swapfs functions on all architectures

By only compiling the ext2fs_swap_* functions on big-endian systems,
it causes debian/libext2fs2.symbols to need to be different on
different little-endian vs big-endian architectures.  Including the
ext2fS_swap_* functions increases the size of the library by ~6k,
which is not a big deal.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/debian/libext2fs2.symbols b/debian/libext2fs2.symbols
index 78c20b2..838676f 100644
--- a/debian/libext2fs2.symbols
+++ b/debian/libext2fs2.symbols
@@ -175,6 +175,10 @@ libext2fs.so.2 libext2fs2 #MINVER#
  ext2fs_dirent_name_len@Base 1.43
  ext2fs_dirent_set_file_type@Base 1.43
  ext2fs_dirent_set_name_len@Base 1.43
+ ext2fs_dirent_swab_in2@Base 1.43
+ ext2fs_dirent_swab_in@Base 1.43
+ ext2fs_dirent_swab_out2@Base 1.43
+ ext2fs_dirent_swab_out@Base 1.43
  ext2fs_dirhash2@Base 1.45
  ext2fs_dirhash@Base 1.37
  ext2fs_div64_ceil@Base 1.42
@@ -514,6 +518,15 @@ libext2fs.so.2 libext2fs2 #MINVER#
  ext2fs_swab16@Base 1.37
  ext2fs_swab32@Base 1.37
  ext2fs_swab64@Base 1.40
+ ext2fs_swap_ext_attr@Base 1.40
+ ext2fs_swap_ext_attr_entry@Base 1.41
+ ext2fs_swap_ext_attr_header@Base 1.41
+ ext2fs_swap_group_desc2@Base 1.42
+ ext2fs_swap_group_desc@Base 1.37
+ ext2fs_swap_inode@Base 1.37
+ ext2fs_swap_inode_full@Base 1.40
+ ext2fs_swap_mmp@Base 1.42
+ ext2fs_swap_super@Base 1.37
  ext2fs_symlink@Base 1.42.7
  ext2fs_sync_device@Base 1.37
  ext2fs_tdb_append@Base 1.40
diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
index a156004..e795278 100644
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -22,7 +22,6 @@
 #include "ext2fsP.h"
 #include <ext2fs/ext2_ext_attr.h>
 
-#ifdef WORDS_BIGENDIAN
 void ext2fs_swap_super(struct ext2_super_block * sb)
 {
 	int i;
@@ -479,5 +478,3 @@ errcode_t ext2fs_dirent_swab_out2(ext2_filsys fs, char *buf,
 
 	return 0;
 }
-
-#endif