From 888cd6891ff347ca1a80f546f263f804a36e4cbb Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 4 Jun 2009 14:03:08 +0000 Subject: [PATCH] b=19730 i=panda (original version) i=johann (original version) i=rread (HEAD version) Don't check for 64-bit quotas for patchless client builds. --- lustre/autoconf/lustre-core.m4 | 52 ++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 7af19f5..bcf509e 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1936,6 +1936,31 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# +# LC_QUOTA64 +# linux kernel have 64-bit limits support +# +AC_DEFUN([LC_QUOTA64], +[if test x$enable_quota_module = xyes -a x$enable_server = xyes ; then + AC_MSG_CHECKING([if kernel has 64-bit quota limits support]) + LB_LINUX_TRY_COMPILE([ + #include + #include + #include + int versions[] = V2_INITQVERSIONS_R1; + struct v2_disk_dqblk_r1 dqblk_r1; + ],[],[ + AC_DEFINE(HAVE_QUOTA64, 1, [have quota64]) + AC_MSG_RESULT([yes]) + ],[ + LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ + AC_MSG_ERROR([You have got no 64-bit kernel quota support.]) + ],[]) + AC_MSG_RESULT([no]) + ]) +fi +]) + # LC_SECURITY_PLUG # for SLES10 SP2 # check security plug in sles10 sp2 kernel AC_DEFUN([LC_SECURITY_PLUG], @@ -1984,33 +2009,6 @@ LB_LINUX_TRY_COMPILE([ ]) # -# LC_QUOTA64 -# linux kernel have 64-bit limits support -# -AC_DEFUN([LC_QUOTA64], -[if test x$enable_quota_module = xyes; then - AC_MSG_CHECKING([if kernel has 64-bit quota limits support]) - LB_LINUX_TRY_COMPILE([ - #include - #include - #include - int versions[] = V2_INITQVERSIONS_R1; - struct v2_disk_dqblk_r1 dqblk_r1; - ],[],[ - AC_DEFINE(HAVE_QUOTA64, 1, [have quota64]) - AC_MSG_RESULT([yes]) - ],[ - LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ - if test x$enable_server = xyes ; then - AC_MSG_ERROR([You have got no 64-bit kernel quota support.]) - fi - ],[]) - AC_MSG_RESULT([no]) - ]) -fi -]) - -# # LC_CONFIGURE # # other configure checks -- 1.8.3.1