Whamcloud - gitweb
LU-2800 autoconf: move LC_BLK_QUEUE_MAX_SEGMENTS test 83/5383/4
authorJames Simmons <uja.ornl@gmail.com>
Thu, 14 Nov 2013 13:26:09 +0000 (08:26 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 20 Nov 2013 05:29:43 +0000 (05:29 +0000)
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 <uja.ornl@gmail.com>
Change-Id: Ib2bc9515051bd4ba5dc72911fa1b770db041c5be
Reviewed-on: http://review.whamcloud.com/5383
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
lustre/autoconf/lustre-core.m4

index dbbfc71..583d759 100644 (file)
@@ -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 <linux/blkdev.h>
+],[
+       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 <linux/blkdev.h>
-],[
-        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