Subject: [PATCH] btrfs-progs: Fix the test for EXT4_EPOCH_MASK

Commit Message

Pierre Labastie March 11, 2021, 9:55 p.m. UTC

Commit b3df561fbf has introduced the ability to convert extended
inode time precision on ext4, but this breaks builds on older distros,
where ext4 does not have the nsec time precision.

Commit c615287cc tried to fix that by testing the availability of
the EXT4_EPOCH_MASK macro, but the test is not complete.

This patch aims at fixing the macro test, and changes the
name of the associated HAVE_ macro, since the logic is reverted.

This fixes #353 when ext4 has nsec time precision. Note that
the test fails when ext4 does not have the nsec time precision.
Maybe the test shouldn't be run in that case?

Issue: #353
Signed-off-by: Pierre Labastie <[e-mail]>
---
 configure.ac          | 8 ++++----
 convert/source-ext2.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

  * Copied and modified from fs/ext4/ext4.h
@@ -769,7 +769,7 @@ out:
 	return ret;
 }
 
-#else /* HAVE_OWN_EXT4_EPOCH_MASK_DEFINE */
+#else /* HAVE_EXT4_EPOCH_MASK_DEFINE */
 
 static int ext4_copy_inode_timespec_extra(struct btrfs_inode_item *dst,
 				ext2_ino_t ext2_ino, u32 s_inode_size,
@@ -786,7 +786,7 @@ static int ext4_copy_inode_timespec_extra(struct
btrfs_inode_item *dst,
 	return 0;
 }
 
-#endif /* !HAVE_OWN_EXT4_EPOCH_MASK_DEFINE */
+#endif /* !HAVE_EXT4_EPOCH_MASK_DEFINE */
 
 static int ext2_check_state(struct btrfs_convert_context *cctx)
 {

Patch

diff --git a/configure.ac b/configure.ac
index 612a3f87..dd6a5de7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -251,10 +251,10 @@  else
 AC_DEFINE([HAVE_OWN_FIEMAP_EXTENT_SHARED_DEFINE], [0], [We did not define
FIEMAP_EXTENT_SHARED])
 fi
 
-HAVE_OWN_EXT4_EPOCH_MASK_DEFINE=0
-AX_CHECK_DEFINE([ext2fs/ext2_fs.h], [EXT4_EPOCH_MASK], [],
-		[HAVE_OWN_EXT4_EPOCH_MASK_DEFINE=1
-		 AC_MSG_WARN([no definition of EXT4_EPOCH_MASK found, probably
old e2fsprogs, will use own definition, no 64bit time precision of converted
images])])
+AX_CHECK_DEFINE([ext2fs/ext2_fs.h], [EXT4_EPOCH_MASK],
+                [AC_DEFINE([HAVE_EXT4_EPOCH_MASK_DEFINE], [1],
+                   [Define to 1 if e2fsprogs defines EXT4_EPOCH_MASK])],
+		[AC_MSG_WARN([no definition of EXT4_EPOCH_MASK found, probably
old e2fsprogs, will use own definition, no 64bit time precision of converted
images])])
 
 dnl Define <NAME>_LIBS= and <NAME>_CFLAGS= by pkg-config
 dnl
diff --git a/convert/source-ext2.c b/convert/source-ext2.c
index bd872086..fb655ec0 100644
--- a/convert/source-ext2.c
+++ b/convert/source-ext2.c
@@ -698,7 +698,7 @@  static void ext2_copy_inode_item(struct btrfs_inode_item
*dst,
 	memset(&dst->reserved, 0, sizeof(dst->reserved));
 }
 
-#if HAVE_OWN_EXT4_EPOCH_MASK_DEFINE
+#if HAVE_EXT4_EPOCH_MASK_DEFINE
 
 /*