X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=4cc4bbf653fe0020ee80fa4bea8b69cc6134aec4;hp=fa0d526f76833c34afafd22af041b005e6f11818;hb=784cd144103871bd421c139c09bfbf4d5d29ca08;hpb=f78805dbf041bb42b250fe754dff7b864856203f diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index fa0d526..4cc4bbf 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1239,6 +1239,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 +1351,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. @@ -1835,6 +1836,26 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 3.1 adds get_acl method to inode_operations to read ACL from disk. +# see kernel commit 4e34e719e457f2e031297175410fc0bd4016a085 +# +AC_DEFUN([LC_IOP_GET_ACL], +[AC_MSG_CHECKING([inode_operations has .get_acl member function]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode_operations iop; + iop.get_acl = NULL; +],[ + AC_DEFINE(HAVE_IOP_GET_ACL, 1, + [inode_operations has .get_acl member function]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 3.1.1 has ext4_blocks_for_truncate # AC_DEFUN([LC_BLOCKS_FOR_TRUNCATE], @@ -1855,6 +1876,58 @@ 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 +# +AC_DEFUN([LC_HAVE_VOID_MAKE_REQUEST_FN], +[AC_MSG_CHECKING([if request_queue.make_request_fn returns void but not int]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int ret; + make_request_fn *mrf; + ret = mrf(NULL, NULL); +],[ + AC_MSG_RESULT([no]) +],[ + AC_DEFINE(HAVE_VOID_MAKE_REQUEST_FN, 1, + [request_queue.make_request_fn returns void but not int]) + AC_MSG_RESULT([yes]) +]) +]) + +# +# 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], @@ -1893,6 +1966,235 @@ 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.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 @@ -1991,8 +2293,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 @@ -2037,22 +2339,44 @@ AC_DEFUN([LC_PROG_LINUX], # 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 + + # 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 ]) # @@ -2459,7 +2783,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 @@ -2538,8 +2862,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