From: Eric Sandeen Date: Thu, 16 Jun 2016 22:51:04 +0000 (-0500) Subject: e2undo: fix endian issues X-Git-Tag: v1.43.2~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bf36dc0f40151fdc4179af16000828c1591022;p=thirdparty%2Fe2fsprogs.git e2undo: fix endian issues Two new e2undo issues exist in the latest release on big endian machines. From sparse check: undo_io.c:157:26: warning: invalid assignment: |= undo_io.c:157:26: left side has type restricted __le32 undo_io.c:157:26: right side has type int undo_io.c:161:26: warning: invalid assignment: &= undo_io.c:161:26: left side has type restricted __le32 undo_io.c:161:26: right side has type int e2undo.c:211:16: warning: cast to restricted __le64 e2undo.c:211:16: warning: cast from restricted blk64_t e2undo.c:212:16: warning: cast to restricted __le64 e2undo.c:212:16: warning: cast from restricted blk64_t Addresses-RedHat-Bugzilla: 1344636 Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- diff --git a/lib/ext2fs/undo_io.c b/lib/ext2fs/undo_io.c index f921218fb..776d5b8b9 100644 --- a/lib/ext2fs/undo_io.c +++ b/lib/ext2fs/undo_io.c @@ -154,11 +154,11 @@ struct undo_private_data { #define E2UNDO_FEATURE_COMPAT_FS_OFFSET 0x1 /* the filesystem offset */ static inline void e2undo_set_feature_fs_offset(struct undo_header *header) { - header->f_compat |= E2UNDO_FEATURE_COMPAT_FS_OFFSET; + header->f_compat |= ext2fs_le32_to_cpu(E2UNDO_FEATURE_COMPAT_FS_OFFSET); } static inline void e2undo_clear_feature_fs_offset(struct undo_header *header) { - header->f_compat &= ~E2UNDO_FEATURE_COMPAT_FS_OFFSET; + header->f_compat &= ~ext2fs_le32_to_cpu(E2UNDO_FEATURE_COMPAT_FS_OFFSET); } static io_manager undo_io_backing_manager; diff --git a/misc/e2undo.c b/misc/e2undo.c index a8cb000ab..6fb6e448e 100644 --- a/misc/e2undo.c +++ b/misc/e2undo.c @@ -208,8 +208,7 @@ static int key_compare(const void *a, const void *b) ka = a; kb = b; - return ext2fs_le64_to_cpu(ka->fsblk) - - ext2fs_le64_to_cpu(kb->fsblk); + return ka->fsblk - kb->fsblk; } static int e2undo_setup_tdb(const char *name, io_manager *io_ptr)