X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=b771c537fd8b53541c7d53510dfb023994c9a01c;hp=9603e5044ecaa43e03e1aed84aa8736da334580b;hb=539d4218b8c6d025bb2ebffec313a38b53e08cd1;hpb=8d334f67052ccf77713c780a8040593728977599 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 9603e50..b771c53 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -211,9 +211,9 @@ fi # Quota support. The kernel must support CONFIG_QUOTA. # AC_DEFUN([LC_QUOTA_CONFIG], -[LB_LINUX_CONFIG_IM([QUOTA],[AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [support quota])],[ - AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.]) -]) +[LB_LINUX_CONFIG_IM([QUOTA],[],[ + AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.]) + ]) ]) # truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27) @@ -319,7 +319,7 @@ AC_DEFUN([LC_BIT_SPINLOCK_H], AC_DEFUN([LC_CONST_ACL_SIZE], [AC_MSG_CHECKING([calc acl size]) tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS" +CFLAGS="$CFLAGS -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -I$LINUX/arch/`echo $target_cpu|sed -e 's/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS" AC_TRY_RUN([ #define __KERNEL__ #include @@ -1020,22 +1020,6 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.27 has file_remove_suid instead of remove_suid -AC_DEFUN([LC_FILE_REMOVE_SUID], -[AC_MSG_CHECKING([kernel has file_remove_suid]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - file_remove_suid(NULL); -],[ - AC_DEFINE(HAVE_FILE_REMOVE_SUID, 1, - [kernel have file_remove_suid]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # 2.6.27 have new page locking API AC_DEFUN([LC_TRYLOCKPAGE], [AC_MSG_CHECKING([kernel uses trylock_page for page lock]) @@ -1729,6 +1713,18 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # +# 2.6.38 export simple_setattr +# +AC_DEFUN([LC_EXPORT_SIMPLE_SETATTR], +[LB_CHECK_SYMBOL_EXPORT([simple_setattr], +[fs/libfs.c],[ +AC_DEFINE(HAVE_SIMPLE_SETATTR, 1, + [simple_setattr is exported by the kernel]) +],[ +]) +]) + +# # 2.6.39 remove unplug_fn from request_queue. # AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN], @@ -1798,14 +1794,42 @@ LB_LINUX_TRY_COMPILE([ ]) # -# 2.6.38 export simple_setattr +# 3.1.1 has ext4_blocks_for_truncate # -AC_DEFUN([LC_EXPORT_SIMPLE_SETATTR], -[LB_CHECK_SYMBOL_EXPORT([simple_setattr], -[fs/libfs.c],[ -AC_DEFINE(HAVE_SIMPLE_SETATTR, 1, - [simple_setattr is exported by the kernel]) +AC_DEFUN([LC_BLOCKS_FOR_TRUNCATE], +[AC_MSG_CHECKING([if kernel has ext4_blocks_for_truncate]) +LB_LINUX_TRY_COMPILE([ + #include + #include "$LINUX/fs/ext4/ext4_jbd2.h" + #include "$LINUX/fs/ext4/truncate.h" +],[ + ext4_blocks_for_truncate(NULL); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_BLOCKS_FOR_TRUNCATE, 1, + [kernel has ext4_blocks_for_truncate]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.1 renames lock-manager ops(lock_manager_operations) from fl_xxx to lm_xxx +# see kernel commit 8fb47a4fbf858a164e973b8ea8ef5e83e61f2e50 +# +AC_DEFUN([LC_LM_XXX_LOCK_MANAGER_OPS], +[AC_MSG_CHECKING([if lock-manager ops renamed to lm_xxx]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct lock_manager_operations lm_ops; + lm_ops.lm_compare_owner = NULL; +],[ + AC_DEFINE(HAVE_LM_XXX_LOCK_MANAGER_OPS, 1, + [lock-manager ops renamed to lm_xxx]) + AC_MSG_RESULT([yes]) ],[ + AC_MSG_RESULT([no]) ]) ]) @@ -1848,26 +1872,6 @@ LB_LINUX_TRY_COMPILE([ ]) # -# 3.1.1 has ext4_blocks_for_truncate -# -AC_DEFUN([LC_BLOCKS_FOR_TRUNCATE], -[AC_MSG_CHECKING([if kernel has ext4_blocks_for_truncate]) -LB_LINUX_TRY_COMPILE([ - #include - #include "$LINUX/fs/ext4/ext4_jbd2.h" - #include "$LINUX/fs/ext4/truncate.h" -],[ - ext4_blocks_for_truncate(NULL); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_BLOCKS_FOR_TRUNCATE, 1, - [kernel has ext4_blocks_for_truncate]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# # LC_PROG_LINUX # # Lustre linux kernel checks @@ -1947,7 +1951,6 @@ AC_DEFUN([LC_PROG_LINUX], LC_PGMKWRITE_USE_VMFAULT LC_PGMKWRITE_COMPACT LC_INODE_PERMISION_2ARGS - LC_FILE_REMOVE_SUID LC_TRYLOCKPAGE LC_READ_INODE_IN_SBOPS LC_EXPORT_INODE_PERMISSION @@ -2008,15 +2011,18 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.39 LC_REQUEST_QUEUE_UNPLUG_FN - LC_HAVE_FSTYPE_MOUNT - - # 3.3 - LC_HAVE_MIGRATE_HEADER - LC_MIGRATEPAGE_4ARGS + LC_HAVE_FSTYPE_MOUNT # 3.1.1 LC_BLOCKS_FOR_TRUNCATE + # 3.1 + LC_LM_XXX_LOCK_MANAGER_OPS + + # 3.3 + LC_HAVE_MIGRATE_HEADER + LC_MIGRATEPAGE_4ARGS + # if test x$enable_server = xyes ; then AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) @@ -2291,6 +2297,46 @@ LB_LINUX_TRY_COMPILE([ ]) # +# LC_OSD_ADDON +# +# configure support for optional OSD implementation +# +AC_DEFUN([LC_OSD_ADDON], +[AC_MSG_CHECKING([for osd]) +AC_ARG_WITH([osd], + AC_HELP_STRING([--with-osd=path], + [set path to optional osd]), + [ + case $with_osd in + no) ENABLEOSDADDON=0 + ;; + *) OSDADDON="${with_osd}" + ENABLEOSDADDON=1 + ;; + esac + ], [ + ENABLEOSDADDON=0 + ]) +if test $ENABLEOSDADDON -eq 0; then + AC_MSG_RESULT([no]) + OSDADDON= +else + OSDMODNAME=`basename $OSDADDON` + if test -e $LUSTRE/$OSDMODNAME; then + AC_MSG_RESULT([can't link]) + OSDADDON= + elif ln -s $OSDADDON $LUSTRE/$OSDMODNAME; then + AC_MSG_RESULT([$OSDMODNAME]) + OSDADDON="subdir-m += $OSDMODNAME" + else + AC_MSG_RESULT([can't link]) + OSDADDON= + fi +fi +AC_SUBST(OSDADDON) +]) + +# # LC_CONFIGURE # # other configure checks @@ -2448,9 +2494,11 @@ lustre/kernel_patches/targets/2.6-rhel6.target lustre/kernel_patches/targets/2.6-rhel5.target lustre/kernel_patches/targets/2.6-sles10.target lustre/kernel_patches/targets/2.6-sles11.target +lustre/kernel_patches/targets/3.0-sles11.target lustre/kernel_patches/targets/2.6-oel5.target lustre/kernel_patches/targets/2.6-fc11.target lustre/kernel_patches/targets/2.6-fc12.target +lustre/kernel_patches/targets/2.6-fc15.target lustre/ldlm/Makefile lustre/fid/Makefile lustre/fid/autoMakefile @@ -2483,8 +2531,6 @@ lustre/obdclass/autoMakefile lustre/obdclass/linux/Makefile lustre/obdecho/Makefile lustre/obdecho/autoMakefile -lustre/obdfilter/Makefile -lustre/obdfilter/autoMakefile lustre/ofd/Makefile lustre/ofd/autoMakefile lustre/osc/Makefile @@ -2499,6 +2545,7 @@ lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile lustre/mgs/autoMakefile +lustre/target/Makefile lustre/ptlrpc/Makefile lustre/ptlrpc/autoMakefile lustre/ptlrpc/gss/Makefile @@ -2506,11 +2553,14 @@ lustre/ptlrpc/gss/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile -lustre/scripts/lustre lustre/tests/Makefile lustre/tests/mpi/Makefile lustre/utils/Makefile lustre/utils/gss/Makefile +lustre/osp/Makefile +lustre/osp/autoMakefile +lustre/lod/Makefile +lustre/lod/autoMakefile lustre/obdclass/darwin/Makefile ]) ])