From 88bb292426cc6e398f530a06d3c5852760c8edfa Mon Sep 17 00:00:00 2001 From: Vitaly Fertman Date: Sat, 3 Jul 2021 12:25:14 +0300 Subject: [PATCH] LU-14817 build: __xa_set_mark is not checked anymore LC__XA_SET_MARK does not check for __xa_set_mark anymore after LU-9859, however the result variable still exists and its value has changed from 'no' to 'yes'. Test-Parameters: trivial Fixes: 84e12028be ("LU-9859 libcfs: add support for Xarray") Signed-off-by: Vitaly Fertman Change-Id: I24fffe7f2727b1d892ec3cabfc6e65ae8f68e024 Reviewed-on: https://review.whamcloud.com/44138 Reviewed-by: Andreas Dilger Tested-by: jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/autoconf/lustre-core.m4 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index d8755b2..f95ca26 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -2186,26 +2186,26 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # LC_INODE_TIMESPEC64 # -# LC___XA_SET_MARK +# LC_RADIX_TREE_TAG_SET # # kernel 4.20 commit v4.19-rc5-248-g9b89a0355144 # xarray: Add XArray marks - replaced radix_tree_tag_set # -AC_DEFUN([LC___XA_SET_MARK], [ +AC_DEFUN([LC_RADIX_TREE_TAG_SET], [ tmp_flags="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if '__xa_set_mark' exists], -__xa_set_mark, [ +LB_CHECK_COMPILE([if 'radix_tree_tag_set' exists], +radix_tree_tag_set, [ #include #include ],[ radix_tree_tag_set(NULL, 0, PAGECACHE_TAG_DIRTY); ],[ AC_DEFINE(HAVE_RADIX_TREE_TAG_SET, 1, - [__xa_set_mark exists]) + [radix_tree_tag_set exists]) ]) EXTRA_KCFLAGS="$tmp_flags" -]) # LC___XA_SET_MARK +]) # LC_RADIX_TREE_TAG_SET # # LC_UAPI_LINUX_MOUNT_H @@ -2561,7 +2561,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_INODE_TIMESPEC64 # 4.20 - LC___XA_SET_MARK + LC_RADIX_TREE_TAG_SET LC_UAPI_LINUX_MOUNT_H LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK -- 1.8.3.1