X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=8f928591ec13e967fdf94fabbda57659554c2f3a;hb=426194de03ad47497e99d281d86b5cdfc5142148;hp=6c946577875829bcaccc6c4810360953fa4b8d4f;hpb=5d57988013882e6690cc22ada148a7f215df64db;p=fs%2Flustre-release.git diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 6c94657..8f92859 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -20,7 +20,7 @@ LUSTRE="$PWD/lustre" AC_SUBST(LUSTRE) # mount.lustre -rootsbindir='/sbin' +rootsbindir='$(CROSS_PATH)/sbin' AC_SUBST(rootsbindir) demodir='$(docdir)/demo' @@ -120,13 +120,13 @@ LB_LINUX_TRY_COMPILE([ # AC_DEFUN([LC_MDS_MAX_THREADS], [ - AC_ARG_WITH([mds_max_threads], - AC_HELP_STRING([--with-mds-max-threads=size], - [define the maximum number of threads available on the MDS: (default=512)]), - [ - MDS_THREAD_COUNT=$with_mds_max_threads - AC_DEFINE_UNQUOTED(MDT_MAX_THREADS, $MDS_THREAD_COUNT, [maximum number of mdt threads]) - ]) + AC_ARG_WITH([mds_max_threads], + AC_HELP_STRING([--with-mds-max-threads=count], + [maximum threads available on the MDS: (default=512)]), + [ + MDS_THREAD_COUNT=$with_mds_max_threads + AC_DEFINE_UNQUOTED(MDS_MAX_THREADS, $MDS_THREAD_COUNT, [maximum number of MDS threads]) + ]) ]) # @@ -439,9 +439,9 @@ AC_DEFUN([LC_CONFIG_GSS], LB_LINUX_CONFIG_IM([CRYPTO_SHA512],[], [AC_MSG_WARN([kernel SHA512 support is recommended by using GSS.])]) - AC_CHECK_LIB([gssapi], [gss_init_sec_context], + AC_CHECK_LIB([gssapi], [gss_export_lucid_sec_context], [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi"], - [AC_CHECK_LIB([gssglue], [gss_init_sec_context], + [AC_CHECK_LIB([gssglue], [gss_export_lucid_sec_context], [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssglue"], [AC_MSG_ERROR([libgssapi or libgssglue is not found, which is required by GSS.])])],) @@ -1114,6 +1114,42 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# 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" +EXTRA_KCFLAGS="-Werror" +[AC_MSG_CHECKING([if quotactl_ops.set_dqblk takes struct fs_disk_quota]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct quotactl_ops qops = {}; + struct fs_disk_quota fdq; + qops.set_dqblk(NULL, 0, 0, &fdq); +],[ + AC_DEFINE(HAVE_DQUOT_FS_DISK_QUOTA, 1, [quotactl_ops.set_dqblk takes struct fs_disk_quota]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# 2.6.34 has renamed dquot options to dquot_*, check for dquot_suspend +AC_DEFUN([LC_HAVE_DQUOT_SUSPEND], +[AC_MSG_CHECKING([if dquot_suspend is defined]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + dquot_suspend(NULL, -1); +],[ + AC_DEFINE(HAVE_DQUOT_SUSPEND, 1, [dquot_suspend is defined]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # LC_LOCK_MAP_ACQUIRE # after 2.6.27 lock_map_acquire replaces lock_acquire AC_DEFUN([LC_LOCK_MAP_ACQUIRE], @@ -1239,6 +1275,7 @@ AC_DEFUN([LC_EXPORT_CPUMASK_OF_NODE], the kernel])]) # x86_64 ]) + # 2.6.31 replaces blk_queue_hardsect_size by blk_queue_logical_block_size function AC_DEFUN([LC_BLK_QUEUE_LOG_BLK_SIZE], [AC_MSG_CHECKING([if blk_queue_logical_block_size is defined]) @@ -1350,7 +1387,7 @@ LB_LINUX_TRY_COMPILE([ ],[ AC_MSG_RESULT(no) ]) -]) +]) # 2.6.32 removes blk_queue_max_sectors and add blk_queue_max_hw_sectors # check blk_queue_max_sectors and use it until disappear. @@ -1657,40 +1694,6 @@ AC_DEFINE(HAVE_BLKDEV_GET_BY_DEV, 1, ]) # -# 2.6.38 vfsmount.mnt_count doesn't use atomic_t -# -# 3.3 starts hiding vfsmount guts series (move from include/linux/mount.h to -# fs/mount.h, see kernel commit 7d6fec45a5131918b51dcd76da52f2ec86a85be6) -# -AC_DEFUN([LC_ATOMIC_MNT_COUNT], -[AC_MSG_CHECKING([if vfsmount guts is hidden, or vfsmount.mnt_count is atomic_t.]) -LB_LINUX_TRY_COMPILE([ - #include - #include <../fs/mount.h> -],[ - struct mount *mnt = real_mount((struct vfsmount *)0); -],[ - AC_DEFINE(HAVE_HIDE_VFSMOUNT_GUTS, 1, - [hide vfsmount guts in fs/mount.h]) - AC_MSG_RESULT([yes, hide vfsmount guts in fs/mount.h]) -],[ - LB_LINUX_TRY_COMPILE([ - #include - #include - #include - ],[ - ((struct vfsmount *)0)->mnt_count = ((atomic_t) { 0 }); - ],[ - AC_DEFINE(HAVE_ATOMIC_MNT_COUNT, 1, - [vfsmount.mnt_count is atomic_t]) - AC_MSG_RESULT([yes, vfsmount.mnt_count is atomic_t]) - ],[ - AC_MSG_RESULT([no]) - ]) -]) -]) - -# # 2.6.38 use path as 4th parameter in quota_on. # AC_DEFUN([LC_QUOTA_ON_USE_PATH], @@ -1762,6 +1765,26 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 3.0 dirty_inode() has a flag parameter +# see kernel commit aa38572954ade525817fe88c54faebf85e5a61c0 +# +AC_DEFUN([LC_DIRTY_INODE_WITH_FLAG], +[AC_MSG_CHECKING([if dirty_inode super_operation takes flag]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode *inode; + inode->i_sb->s_op->dirty_inode(NULL, 0); +],[ + AC_DEFINE(HAVE_DIRTY_INODE_HAS_FLAG, 1, + [dirty_inode super_operation takes flag]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 2.6.38 generic_permission taken 4 parameters. # in fact, it means rcu-walk aware permission bring. # @@ -1875,6 +1898,16 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 3.1 introduced generic_file_llseek_size() +# +AC_DEFUN([LC_FILE_LLSEEK_SIZE], + [LB_CHECK_SYMBOL_EXPORT([generic_file_llseek_size], + [fs/read_write.c], + [AC_DEFINE(HAVE_FILE_LLSEEK_SIZE, 1, + [generic_file_llseek_size is exported by the kernel])]) +]) + +# # 3.2 request_queue.make_request_fn defined as function returns with void # see kernel commit 5a7bbad27a410350e64a2d7f5ec18fc73836c14f # @@ -1896,6 +1929,27 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 3.2 protects inode->i_nlink from direct modification +# see kernel commit a78ef704a8dd430225955f0709b22d4a6ba21deb +# at the same time adds set_nlink(), so checks set_nlink() for it. +# +AC_DEFUN([LC_HAVE_PROTECT_I_NLINK], +[AC_MSG_CHECKING([if inode->i_nlink is protected from direct modification]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode i; + set_nlink(&i, 1); +],[ + AC_DEFINE(HAVE_PROTECT_I_NLINK, 1, + [inode->i_nlink is protected from direct modification]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 3.3 introduces migrate_mode.h and migratepage has 4 args # AC_DEFUN([LC_HAVE_MIGRATE_HEADER], @@ -1934,6 +1988,251 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 3.3 switchs super_operations to use dentry as parameter (but not vfsmount) +# see kernel commit 34c80b1d93e6e20ca9dea0baf583a5b5510d92d4 +# +AC_DEFUN([LC_SUPEROPS_USE_DENTRY], +[AC_MSG_CHECKING([if super_operations use dentry as parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + int show_options(struct seq_file *seq, struct dentry *root){ + return 0; + } +],[ + struct super_operations ops; + ops.show_options = show_options; +],[ + AC_DEFINE(HAVE_SUPEROPS_USE_DENTRY, 1, + [super_operations use dentry as parameter]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# +# 3.3 switchs inode_operations to use umode_t as parameter (but not int) +# see kernel commit 1a67aafb5f72a436ca044293309fa7e6351d6a35 +# +AC_DEFUN([LC_INODEOPS_USE_UMODE_T], +[AC_MSG_CHECKING([if inode_operations use umode_t as parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + #include + int my_mknod(struct inode *dir, struct dentry *dchild, + umode_t mode, dev_t dev) + { + return 0; + } +],[ + struct inode_operations ops; + ops.mknod = my_mknod; +],[ + AC_DEFINE(HAVE_INODEOPS_USE_UMODE_T, 1, + [inode_operations use umode_t as parameter]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# 3.4 kmap_atomic removes second argument +# see kernel commit 1ec9c5ddc17aa398f05646abfcbaf315b544e62f +# +AC_DEFUN([LC_KMAP_ATOMIC_HAS_1ARG], +[AC_MSG_CHECKING([if kmap_atomic has only 1 argument]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + kmap_atomic(NULL); +],[ + AC_DEFINE(HAVE_KMAP_ATOMIC_HAS_1ARG, 1, + [have kmap_atomic has only 1 argument]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.4 switchs touch_atime to struct path +# see kernel commit 68ac1234fb949b66941d94dce4157742799fc581 +# +AC_DEFUN([LC_TOUCH_ATIME_1ARG], +[AC_MSG_CHECKING([if touch_atime use one argument]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + touch_atime((struct path *)NULL); +],[ + AC_DEFINE(HAVE_TOUCH_ATIME_1ARG, 1, + [touch_atime use one argument]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.4 converts d_alloc_root to d_make_root +# see kernel commit 32991ab305ace7017c62f8eecbe5eb36dc32e13b +# +AC_DEFUN([LC_HAVE_D_MAKE_ROOT], +[AC_MSG_CHECKING([if have d_make_root]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + d_make_root((struct inode *)NULL); +],[ + AC_DEFINE(HAVE_D_MAKE_ROOT, 1, + [have d_make_root]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.5 renames end_writeback() back to clear_inode()... +# see kernel commit dbd5768f87ff6fb0a4fe09c4d7b6c4a24de99430 +# +AC_DEFUN([LC_HAVE_CLEAR_INODE], +[AC_MSG_CHECKING([if have clear_inode]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + clear_inode((struct inode *)NULL); +],[ + AC_DEFINE(HAVE_CLEAR_INODE, 1, + [have clear_inode]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.5 encode_fh has parent inode passed in directly +# see kernel commit b0b0382b +# +AC_DEFUN([LC_HAVE_ENCODE_FH_PARENT], +[AC_MSG_CHECKING([if encode_fh have parent inode as parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + #include + #include + int ll_encode_fh(struct inode *i, __u32 *a, int *b, struct inode *p) + { + return 0; + } +],[ + struct export_operations exp_op; + exp_op.encode_fh = ll_encode_fh; +],[ + AC_DEFINE(HAVE_ENCODE_FH_PARENT, 1, + [have parent inode as parameter]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# 3.5 has generic_file_llseek_size with 5 args +AC_DEFUN([LC_FILE_LLSEEK_SIZE_5ARG], +[AC_MSG_CHECKING([if kernel has generic_file_llseek_size with 5 args]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + generic_file_llseek_size(NULL, 0, 0, 0, 0); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FILE_LLSEEK_SIZE_5ARGS, 1, + [kernel has generic_file_llseek_size with 5 args]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.6 switch i_dentry/d_alias from list to hlist +# +AC_DEFUN([LC_HAVE_DENTRY_D_ALIAS_HLIST], +[AC_MSG_CHECKING([if i_dentry/d_alias uses hlist]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct inode inode; + struct dentry dentry; + struct hlist_head head; + struct hlist_node node; + inode.i_dentry = head; + dentry.d_alias = node; +],[ + AC_DEFINE(HAVE_DENTRY_D_ALIAS_HLIST, 1, + [have i_dentry/d_alias uses hlist]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# +# 3.6 dentry_open uses struct path as first argument +# see kernel commit 765927b2 +# +AC_DEFUN([LC_DENTRY_OPEN_USE_PATH], +[AC_MSG_CHECKING([if dentry_open uses struct path as first argument]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct path path; + dentry_open(&path, 0, NULL); +],[ + AC_DEFINE(HAVE_DENTRY_OPEN_USE_PATH, 1, + [dentry_open uses struct path as first argument]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# +# 3.6 vfs adds iop->atomic_open +# +AC_DEFUN([LC_HAVE_IOP_ATOMIC_OPEN], +[AC_MSG_CHECKING([if iop has atomic_open]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode_operations iop; + iop.atomic_open = NULL; +],[ + AC_DEFINE(HAVE_IOP_ATOMIC_OPEN, 1, + [have iop atomic_open]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # LC_PROG_LINUX # # Lustre linux kernel checks @@ -2032,8 +2331,8 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.29 LC_SB_ANY_QUOTA_LOADED - # 2.6.30 - LC_EXPORT_CPUMASK_OF_NODE + # 2.6.30 + LC_EXPORT_CPUMASK_OF_NODE # 2.6.31 LC_BLK_QUEUE_LOG_BLK_SIZE @@ -2051,6 +2350,10 @@ AC_DEFUN([LC_PROG_LINUX], LC_EXPORT_ACCESS_PROCESS_VM LC_VFS_INODE_NEWSIZE_OK + # 2.6.34 + LC_HAVE_DQUOT_FS_DISK_QUOTA + LC_HAVE_DQUOT_SUSPEND + # 2.6.35, 3.0.0 LC_FILE_FSYNC LC_EXPORT_SIMPLE_SETATTR @@ -2063,7 +2366,6 @@ AC_DEFUN([LC_PROG_LINUX], LC_KERNEL_LOCKED # 2.6.38 - LC_ATOMIC_MNT_COUNT LC_BLKDEV_GET_BY_DEV LC_GENERIC_PERMISSION LC_QUOTA_ON_USE_PATH @@ -2075,29 +2377,51 @@ AC_DEFUN([LC_PROG_LINUX], LC_REQUEST_QUEUE_UNPLUG_FN LC_HAVE_FSTYPE_MOUNT + # 3.0 + LC_DIRTY_INODE_WITH_FLAG + # 3.1 LC_LM_XXX_LOCK_MANAGER_OPS LC_INODE_DIO_WAIT LC_IOP_GET_ACL + LC_FILE_LLSEEK_SIZE # 3.1.1 LC_BLOCKS_FOR_TRUNCATE # 3.2 LC_HAVE_VOID_MAKE_REQUEST_FN + LC_HAVE_PROTECT_I_NLINK # 3.3 LC_HAVE_MIGRATE_HEADER LC_MIGRATEPAGE_4ARGS + LC_SUPEROPS_USE_DENTRY + LC_INODEOPS_USE_UMODE_T + + # 3.4 + LC_TOUCH_ATIME_1ARG + LC_HAVE_D_MAKE_ROOT + LC_KMAP_ATOMIC_HAS_1ARG + + # 3.5 + LC_HAVE_CLEAR_INODE + LC_HAVE_ENCODE_FH_PARENT + LC_FILE_LLSEEK_SIZE_5ARG + + # 3.6 + LC_HAVE_DENTRY_D_ALIAS_HLIST + LC_DENTRY_OPEN_USE_PATH + LC_HAVE_IOP_ATOMIC_OPEN - # - if test x$enable_server = xyes ; then - AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) - LC_FUNC_DEV_SET_RDONLY - LC_STACK_SIZE - LC_QUOTA64 - LC_QUOTA_CONFIG - fi + # + if test x$enable_server = xyes ; then + AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) + LC_FUNC_DEV_SET_RDONLY + LC_STACK_SIZE + LC_QUOTA64 + LC_QUOTA_CONFIG + fi ]) # @@ -2504,7 +2828,7 @@ AC_ARG_ENABLE([pgstate-track], AC_MSG_CHECKING([whether to enable page state tracking]) AC_MSG_RESULT([$enable_pgstat_track]) if test x$enable_pgstat_track = xyes ; then - AC_DEFINE([LUSTRE_PAGESTATE_TRACKING], 1, + AC_DEFINE([CONFIG_DEBUG_PAGESTATE_TRACKING], 1, [enable page state tracking code]) fi @@ -2559,13 +2883,12 @@ lustre/include/darwin/Makefile lustre/include/lustre/Makefile 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/kernel_patches/targets/3.x-fc18.target lustre/ldlm/Makefile lustre/fid/Makefile lustre/fid/autoMakefile @@ -2583,8 +2906,6 @@ lustre/mdc/Makefile lustre/mdc/autoMakefile lustre/lmv/Makefile lustre/lmv/autoMakefile -lustre/mds/Makefile -lustre/mds/autoMakefile lustre/mdt/Makefile lustre/mdt/autoMakefile lustre/mdd/Makefile