X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=49d40c1291b3de097a176e568c88cde1f70cf928;hb=90fd0cd449b9ae3fbff5a99e0edcf288799037c0;hp=8cd0b9ad65a501d811a086c4f0d817a00ce66ab8;hpb=fd8ef48571a2752f6c6a4c47127178a765d5b328;p=fs%2Flustre-release.git diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 8cd0b9a..49d40c1 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -13,6 +13,9 @@ esac AS_IF([test -z "$LDISKFS_SERIES"], [ AS_IF([test x$RHEL_KERNEL = xyes], [ case $RHEL_RELEASE_NO in + 80) LDISKFS_SERIES="4.18-rhel8.series" ;; + 76) LDISKFS_SERIES="3.10-rhel7.6.series" ;; + 75) LDISKFS_SERIES="3.10-rhel7.5.series" ;; 74) LDISKFS_SERIES="3.10-rhel7.4.series" ;; 73) LDISKFS_SERIES="3.10-rhel7.3.series" ;; 72) LDISKFS_SERIES="3.10-rhel7.2.series" ;; @@ -26,6 +29,7 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ 6[0-3]) LDISKFS_SERIES="2.6-rhel6.series" ;; esac ], [test x$SUSE_KERNEL = xyes], [ + AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.82],[ AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[3.0.0],[ @@ -50,7 +54,38 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ ;; esac ])],[LDISKFS_SERIES="4.4-sles12sp2.series"], - [LDISKFS_SERIES="4.4-sles12sp2.series"]) + [LDISKFS_SERIES="4.4-sles12sp2.series"] + )], [LDISKFS_SERIES="4.4-sles12sp3.series"], + [LDISKFS_SERIES="4.4-sles12sp3.series"]) +], [test x$UBUNTU_KERNEL = xyes], [ + AS_VERSION_COMPARE([$LINUXRELEASE],[4.15.0],[ + AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0], [], + [ + KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p') + AS_IF( + [test -z "$KPLEV"], [ + AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.]) + LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series" + ], + [test $KPLEV -ge 73], [LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"], + [test $KPLEV -ge 62], [LDISKFS_SERIES="4.4.0-62-ubuntu14+16.series"], + [test $KPLEV -ge 49], [LDISKFS_SERIES="4.4.0-49-ubuntu14+16.series"], + [LDISKFS_SERIES="4.4.0-45-ubuntu14+16.series"] + ) + ], + [LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"])], + [ + KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p') + AS_IF( + [test -z "$KPLEV"], [ + AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.]) + LDISKFS_SERIES="4.15.0-24-ubuntu18.series" + ], + [test $KPLEV -ge 24], [LDISKFS_SERIES="4.15.0-24-ubuntu18.series"], + [test $KPLEV -ge 20], [LDISKFS_SERIES="4.15.0-20-ubuntu18.series"] + ) + ], + [LDISKFS_SERIES="4.15.0-24-ubuntu18.series"]) ]) ]) AS_IF([test -z "$LDISKFS_SERIES"], @@ -170,6 +205,65 @@ ext4_info_dquot, [ ]) # LB_EXT4_HAVE_INFO_DQUOT # +# LB_EXT4_HAVE_I_CRYPT_INFO +# +# in linux 4.8 i_crypt_info moved from ext4_inode_info to struct inode +# +# Determine if we need to enable CONFIG_LDISKFS_FS_ENCRYPTION. +# If we have i_crypt_info in ext4_inode_info, the config option +# should be enabled to make the ldiskfs module compilation happy. +# Otherwise i_crypy_info is in struct inode, we need to check kernel +# config option to determine that. +# +AC_DEFUN([LB_EXT4_HAVE_I_CRYPT_INFO], [ +LB_CHECK_COMPILE([if i_crypt_info is in ext4_inode_info], +ext4_i_crypt_info, [ + #define CONFIG_EXT4_FS_ENCRYPTION 1 + #include + #include "$EXT4_SRC_DIR/ext4.h" +],[ + struct ext4_inode_info in; + + in.i_crypt_info = NULL; +],[ + AC_DEFINE( + CONFIG_LDISKFS_FS_ENCRYPTION, 1, + [enable encryption for ldiskfs] + ) +],[ + LB_CHECK_CONFIG([EXT4_FS_ENCRYPTION],[ + AC_DEFINE( + CONFIG_LDISKFS_FS_ENCRYPTION, 1, + [enable encryption for ldiskfs] + ) + ]) +]) +]) # LB_EXT4_HAVE_I_CRYPT_INFO + +# +# LB_LDISKFS_IGET_HAS_FLAGS_ARG +# +# kernel 4.19 commit 8a363970d1dc38c4ec4ad575c862f776f468d057 +# ext4_iget changed to a macro with 3 args was function with 2 args +# +AC_DEFUN([LB_LDISKFS_IGET_HAS_FLAGS_ARG], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if ldiskfs_iget takes a flags argument], +ext4_iget_3args, [ + #include + #include "$EXT4_SRC_DIR/ext4.h" +],[ + int f = EXT4_IGET_SPECIAL; + (void)f; +],[ + AC_DEFINE(HAVE_LDISKFS_IGET_WITH_FLAGS, 1, + [if ldiskfs_iget takes a flags argument]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LB_LDISKFS_IGET_HAS_FLAGS_ARG + +# # LDISKFS_AC_PATCH_PROGRAM # # Determine which program should be used to apply the patches to @@ -241,6 +335,7 @@ AS_IF([test x$enable_ldiskfs != xno],[ # set is available for the detected kernel. For now, we just always # set it to "yes". AS_IF([test x$enable_ldiskfs = xmaybe], [enable_ldiskfs=yes]) + AC_SUBST(ENABLE_LDISKFS, yes) LDISKFS_LINUX_SERIES LDISKFS_AC_PATCH_PROGRAM @@ -250,13 +345,16 @@ AS_IF([test x$enable_ldiskfs != xno],[ LB_LDISKFS_MAP_BLOCKS LB_EXT4_BREAD_4ARGS LB_EXT4_HAVE_INFO_DQUOT + LB_EXT4_HAVE_I_CRYPT_INFO + LB_LDISKFS_IGET_HAS_FLAGS_ARG AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs]) AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs]) AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs]) AC_DEFINE(CONFIG_LDISKFS_FS_RW, 1, [enable rw access for ldiskfs]) - AC_DEFINE(CONFIG_LDISKFS_FS_ENCRYPTION, 1, [enable encryption for ldiskfs]) AC_SUBST(LDISKFS_SUBDIR, ldiskfs) AC_DEFINE(HAVE_LDISKFS_OSD, 1, Enable ldiskfs osd) +], [ + AC_SUBST(ENABLE_LDISKFS, no) ]) AC_MSG_CHECKING([whether to build ldiskfs]) @@ -322,11 +420,21 @@ AS_IF([test -e "$linux_src/fs/ext4/super.c"], [ EXT4_SRC_DIR="$linux_src/fs/ext4" ], [ # Kernel ext source provided by kernel-debuginfo-common package - linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \ + # that extracted to $LINUX + linux_src=$(ls -1d $linux_src/../../debug/*/linux-${LINUXRELEASE%.*}* \ 2>/dev/null | tail -1) - AS_IF([test -e "$linux_src/fs/ext4/super.c"], - [EXT4_SRC_DIR="$linux_src/fs/ext4"], - [EXT4_SRC_DIR=""]) + AS_IF([test -e "$linux_src/fs/ext4/super.c"], [ + EXT4_SRC_DIR="$linux_src/fs/ext4" + ], [ + # Kernel ext source provided by kernel-debuginfo-common package + linux_src=$(ls -1d /usr/src/debug/*/linux-${LINUXRELEASE%.*}* \ + 2>/dev/null | tail -1) + AS_IF([test -e "$linux_src/fs/ext4/super.c"], [ + EXT4_SRC_DIR="$linux_src/fs/ext4" + ], [ + EXT4_SRC_DIR="" + ]) + ]) ]) AC_MSG_RESULT([$EXT4_SRC_DIR]) AC_SUBST(EXT4_SRC_DIR)