From 36da47b409535f947549dcf560a3b1c1bd38af4a Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Mon, 30 Apr 2018 10:37:06 -0400 Subject: btrfs-progs: convert: fix support for e2fsprogs < 1.42 Commit 324d4c1857a (btrfs-progs: convert: Add larger device support) introduced new dependencies on the 64-bit API provided by e2fsprogs. That API was introduced in v1.42 (along with bigalloc). This patch maps the following to their equivalents in e2fsprogs < 1.42. - ext2fs_get_block_bitmap_range2 - ext2fs_inode_data_blocks2 - ext2fs_read_ext_attr2 Since we need to detect and define EXT2_FLAG_64BITS for compatibilty anyway, it makes sense to use that to detect the older e2fsprogs instead of defining a new flag ourselves. Signed-off-by: Jeff Mahoney Signed-off-by: David Sterba --- configure.ac | 6 +----- convert/source-ext2.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index a4c98b31..17978f6b 100644 --- a/configure.ac +++ b/configure.ac @@ -144,11 +144,7 @@ BTRFSCONVERT_EXT2=0 BTRFSCONVERT_REISERFS=0 if test "x$enable_convert" = xyes; then if test "x$with_convert" = "xauto" || echo "$with_convert" | grep -q "ext2"; then - PKG_CHECK_MODULES(EXT2FS, [ext2fs >= 1.42],, - [PKG_CHECK_MODULES(EXT2FS, [ext2fs], - [AC_DEFINE([HAVE_OLD_E2FSPROGS], [1], - [E2fsprogs does not support BIGALLOC])] - )]) + PKG_CHECK_MODULES(EXT2FS, [ext2fs]) PKG_CHECK_MODULES(COM_ERR, [com_err]) convertfs="${convertfs:+$convertfs,}ext2" BTRFSCONVERT_EXT2=1 diff --git a/convert/source-ext2.h b/convert/source-ext2.h index 80833b21..c3214125 100644 --- a/convert/source-ext2.h +++ b/convert/source-ext2.h @@ -33,8 +33,18 @@ * BIGALLOC. * Unlike normal RO compat flag, BIGALLOC affects how e2fsprogs check used * space, and btrfs-convert heavily relies on it. + * + * e2fsprogs 1.42 also introduced the 64-bit API. Any file system + * that requires it will have EXT4_FEATURE_INCOMPAT_64BIT set and + * will fail to open with earlier releases. We can map it to the + * older API without risk of corruption. */ -#ifdef HAVE_OLD_E2FSPROGS +#ifndef EXT2_FLAG_64BITS +#define EXT2_FLAG_64BITS (0) +#define ext2fs_get_block_bitmap_range2 ext2fs_get_block_bitmap_range +#define ext2fs_inode_data_blocks2 ext2fs_inode_data_blocks +#define ext2fs_read_ext_attr2 ext2fs_read_ext_attr +#define ext2fs_blocks_count(s) ((s)->s_blocks_count) #define EXT2FS_CLUSTER_RATIO(fs) (1) #define EXT2_CLUSTERS_PER_GROUP(s) (EXT2_BLOCKS_PER_GROUP(s)) #define EXT2FS_B2C(fs, blk) (blk) -- cgit v1.2.3