From 2584f705b95adba6db2e3a38fc5c12381015a98b Mon Sep 17 00:00:00 2001 From: James Simmons Date: Thu, 14 Nov 2013 08:26:09 -0500 Subject: [PATCH] LU-2800 autoconf: move LC_BLK_QUEUE_MAX_SEGMENTS test This patch is a cosmetic in that we move the test for blk_queue_max_segements out of the quota test section and place it in the list were it makes sense. Signed-off-by: James Simmons Change-Id: Ib2bc9515051bd4ba5dc72911fa1b770db041c5be Reviewed-on: http://review.whamcloud.com/5383 Tested-by: Jenkins Reviewed-by: Bob Glossman Reviewed-by: Andreas Dilger Tested-by: Maloo --- lustre/autoconf/lustre-core.m4 | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index dbbfc71..583d759 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -378,6 +378,22 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# 2.6.32 replaces 2 functions blk_queue_max_phys_segments and blk_queue_max_hw_segments by blk_queue_max_segments +AC_DEFUN([LC_BLK_QUEUE_MAX_SEGMENTS], +[AC_MSG_CHECKING([if blk_queue_max_segments is defined]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + blk_queue_max_segments(NULL, 0); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BLK_QUEUE_MAX_SEGMENTS, 1, + [blk_queue_max_segments is defined]) +],[ + AC_MSG_RESULT(no) +]) +]) + # 2.6.34 has quotactl_ops->[sg]et_dqblk that take struct fs_disk_quota AC_DEFUN([LC_HAVE_DQUOT_FS_DISK_QUOTA], tmp_flags="$EXTRA_KCFLAGS" @@ -414,24 +430,6 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.32 - -# 2.6.32 replaces 2 functions blk_queue_max_phys_segments and blk_queue_max_hw_segments by blk_queue_max_segments -AC_DEFUN([LC_BLK_QUEUE_MAX_SEGMENTS], -[AC_MSG_CHECKING([if blk_queue_max_segments is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - blk_queue_max_segments(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_QUEUE_MAX_SEGMENTS, 1, - [blk_queue_max_segments is defined]) -],[ - AC_MSG_RESULT(no) -]) -]) - # # LC_QUOTA64 # @@ -1240,8 +1238,8 @@ AC_DEFUN([LC_PROG_LINUX], LC_CONFIG_RMTCLIENT LC_CONFIG_GSS - # 2.6.32 - LC_BLK_QUEUE_MAX_SEGMENTS + # 2.6.32 + LC_BLK_QUEUE_MAX_SEGMENTS # 2.6.34 LC_HAVE_DQUOT_FS_DISK_QUOTA -- 1.8.3.1