From 886454a8f9fb45c843865955c207b6060f1f9192 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Wed, 2 Sep 2009 03:23:56 +0000 Subject: [PATCH] Branch HEAD b=19808 i=shadow, adilger Remove obsolete configure checks. --- lustre/autoconf/lustre-core.m4 | 484 +++++++++------------------------ lustre/include/linux/lustre_compat25.h | 36 +-- lustre/llite/llite_internal.h | 26 +- lustre/llite/lproc_llite.c | 2 +- 4 files changed, 136 insertions(+), 412 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 583c6c5..9796994 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -48,195 +48,24 @@ esac ]) # -# LC_CONFIG_EXT3 +# Ensure stack size big than 8k in Lustre server (all kernels) # -# that ext3 is enabled in the kernel -# -AC_DEFUN([LC_CONFIG_EXT3], -[LB_LINUX_CONFIG([EXT3_FS],[],[ - LB_LINUX_CONFIG([EXT3_FS_MODULE],[],[$2]) -]) -LB_LINUX_CONFIG([EXT3_FS_XATTR],[$1],[$3]) -]) - -# -# LC_FSHOOKS -# -# If we have (and can build) fshooks.h -# -AC_DEFUN([LC_FSHOOKS], -[LB_CHECK_FILE([$LINUX/include/linux/fshooks.h],[ - AC_MSG_CHECKING([if fshooks.h can be compiled]) - LB_LINUX_TRY_COMPILE([ - #include - ],[],[ - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - AC_MSG_WARN([You might have better luck with gcc 3.3.x.]) - AC_MSG_WARN([You can set CC=gcc33 before running configure.]) - AC_MSG_ERROR([Your compiler cannot build fshooks.h.]) - ]) -$1 -],[ -$2 -]) -]) - -# -# LC_FUNC_RELEASEPAGE_WITH_INT -# -# if ->releasepage() takes an int arg in 2.6.9 -# This kernel defines gfp_t (HAS_GFP_T) but doesn't use it for this function, -# while others either don't have gfp_t or pass gfp_t as the parameter. -# -AC_DEFUN([LC_FUNC_RELEASEPAGE_WITH_INT], -[AC_MSG_CHECKING([if releasepage has a int parameter]) -RELEASEPAGE_WITH_INT="`grep -c 'releasepage.*int' $LINUX/include/linux/fs.h`" -if test "$RELEASEPAGE_WITH_INT" != 0 ; then - AC_DEFINE(HAVE_RELEASEPAGE_WITH_INT, 1, - [releasepage with int parameter]) - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -]) - -# -# LC_FUNC_FILEMAP_FDATASYNC -# -# if filemap_fdatasync() exists -# -AC_DEFUN([LC_FUNC_FILEMAP_FDATAWRITE], -[AC_MSG_CHECKING([whether filemap_fdatawrite() is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int (*foo)(struct address_space *)= filemap_fdatawrite; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FILEMAP_FDATAWRITE, 1, [filemap_fdatawrite() found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_HEADER_MM_INLINE -# -# RHEL kernels define page_count in mm_inline.h -# -AC_DEFUN([LC_HEADER_MM_INLINE], -[AC_MSG_CHECKING([if kernel has mm_inline.h header]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - #ifndef page_count - #error mm_inline.h does not define page_count - #endif -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_MM_INLINE, 1, [mm_inline found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_STRUCT_INODE -# -# if inode->i_alloc_sem exists -# -AC_DEFUN([LC_STRUCT_INODE], -[AC_MSG_CHECKING([if struct inode has i_alloc_sem]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,24)) - #error "down_read_trylock broken before 2.4.24" - #endif - struct inode i; - return (char *)&i.i_alloc_sem - (char *)&i; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_I_ALLOC_SEM, 1, [struct inode has i_alloc_sem]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_REGISTER_CACHE -# -# if register_cache() is defined by kernel -# -# There are two ways to shrink one customized cache in linux kernels. For the -# kernels are prior than 2.6.5(?), register_cache() is used, and for latest -# kernels, set_shrinker() is used instead. -# -AC_DEFUN([LC_FUNC_REGISTER_CACHE], -[AC_MSG_CHECKING([if kernel defines cache pressure hook]) +AC_DEFUN([LC_STACK_SIZE], +[AC_MSG_CHECKING([stack size big than 8k]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - shrinker_t shrinker; - - set_shrinker(1, shrinker); + #if THREAD_SIZE < 8192 + #error "stack size < 8192" + #endif ],[ - AC_MSG_RESULT([set_shrinker]) - AC_DEFINE(HAVE_SHRINKER_CACHE, 1, [shrinker_cache found]) - AC_DEFINE(HAVE_CACHE_RETURN_INT, 1, [shrinkers should return int]) + AC_MSG_RESULT(yes) ],[ - LB_LINUX_TRY_COMPILE([ - #include - #include - ],[ - struct cache_definition cache; - ],[ - AC_MSG_RESULT([register_cache]) - AC_DEFINE(HAVE_REGISTER_CACHE, 1, [register_cache found]) - AC_MSG_CHECKING([if kernel expects return from cache shrink ]) - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-Werror" - LB_LINUX_TRY_COMPILE([ - #include - #include - ],[ - struct cache_definition c; - c.shrinker = (int (*)(int, unsigned int))1; - ],[ - AC_DEFINE(HAVE_CACHE_RETURN_INT, 1, - [kernel expects return from shrink_cache]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" - ],[ - AC_MSG_RESULT([no]) - ]) + AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.]) ]) ]) # -# LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP -# -# check for our patched grab_cache_page_nowait_gfp() function -# -AC_DEFUN([LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP], -[AC_MSG_CHECKING([if kernel defines grab_cache_page_nowait_gfp()]) -HAVE_GCPN_GFP="`grep -c 'grab_cache_page_nowait_gfp' $LINUX/include/linux/pagemap.h`" -if test "$HAVE_GCPN_GFP" != 0 ; then - AC_DEFINE(HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP, 1, - [kernel has grab_cache_page_nowait_gfp()]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -]) - -# # LC_FUNC_DEV_SET_RDONLY # # check for the old-style dev_set_rdonly which took an extra "devno" param @@ -246,6 +75,7 @@ AC_DEFUN([LC_FUNC_DEV_SET_RDONLY], [AC_MSG_CHECKING([if kernel has new dev_set_rdonly]) LB_LINUX_TRY_COMPILE([ #include + #include ],[ #ifndef HAVE_CLEAR_RDONLY_ON_PUT #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above. @@ -254,7 +84,7 @@ LB_LINUX_TRY_COMPILE([ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel has new dev_set_rdonly]) ],[ - AC_MSG_RESULT([no, Linux kernel source needs to be patches by lustre + AC_MSG_ERROR([no, Linux kernel source needs to be patches by lustre kernel patches from Lustre version 1.4.3 or above.]) ]) ]) @@ -269,19 +99,9 @@ AC_DEFUN([LC_CONFIG_BACKINGFS], BACKINGFS="ldiskfs" if test x$with_ldiskfs = xno ; then - BACKINGFS="ext3" - if test x$linux25$enable_server = xyesyes ; then AC_MSG_ERROR([ldiskfs is required for 2.6-based servers.]) fi - - # --- Check that ext3 and ext3 xattr are enabled in the kernel - LC_CONFIG_EXT3([],[ - AC_MSG_ERROR([Lustre requires that ext3 is enabled in the kernel]) - ],[ - AC_MSG_WARN([Lustre requires that extended attributes for ext3 are enabled in the kernel]) - AC_MSG_WARN([This build may fail.]) - ]) else # ldiskfs is enabled LB_DEFINE_LDISKFS_OPTIONS @@ -414,35 +234,71 @@ AC_TRY_COMPILE([ ]) ]) -AC_DEFUN([LC_FUNC_PAGE_MAPPED], -[AC_MSG_CHECKING([if kernel offers page_mapped]) +# +# LC_FUNC_MS_FLOCK_LOCK +# +# 2.6.5 kernel has MS_FLOCK_LOCK sb flag +# +AC_DEFUN([LC_FUNC_MS_FLOCK_LOCK], +[AC_MSG_CHECKING([if kernel has MS_FLOCK_LOCK sb flag]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - page_mapped(NULL); + int flags = MS_FLOCK_LOCK; ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PAGE_MAPPED, 1, [page_mapped found]) + AC_DEFINE(HAVE_MS_FLOCK_LOCK, 1, + [kernel has MS_FLOCK_LOCK flag]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) ]) ]) -AC_DEFUN([LC_STRUCT_FILE_OPS_UNLOCKED_IOCTL], -[AC_MSG_CHECKING([if struct file_operations has an unlocked_ioctl field]) +# +# LC_FUNC_HAVE_CAN_SLEEP_ARG +# +# 2.6.5 kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait() +# +AC_DEFUN([LC_FUNC_HAVE_CAN_SLEEP_ARG], +[AC_MSG_CHECKING([if kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) LB_LINUX_TRY_COMPILE([ #include ],[ - struct file_operations fops; - &fops.unlocked_ioctl; + int cansleep; + struct file *file; + struct file_lock *file_lock; + flock_lock_file_wait(file, file_lock, cansleep); ],[ + AC_DEFINE(HAVE_CAN_SLEEP_ARG, 1, + [kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_UNLOCKED_IOCTL, 1, [struct file_operations has an unlock ed_ioctl field]) ],[ AC_MSG_RESULT([no]) ]) ]) +# +# LC_FUNC_RELEASEPAGE_WITH_GFP +# +# 2.6.9 ->releasepage() takes a gfp_t arg +# This kernel defines gfp_t (HAS_GFP_T) but doesn't use it for this function, +# while others either don't have gfp_t or pass gfp_t as the parameter. +# +AC_DEFUN([LC_FUNC_RELEASEPAGE_WITH_GFP], +[AC_MSG_CHECKING([if releasepage has a gfp_t parameter]) +RELEASEPAGE_WITH_GFP="$(grep -c 'releasepage.*gfp_t' $LINUX/include/linux/fs.h)" +if test "$RELEASEPAGE_WITH_GFP" != 0 ; then + AC_DEFINE(HAVE_RELEASEPAGE_WITH_GFP, 1, + [releasepage with gfp_t parameter]) + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +]) + +# +# between 2.6.5 - 2.6.22 filemap_populate is exported in some kernels +# AC_DEFUN([LC_FILEMAP_POPULATE], [AC_MSG_CHECKING([for exported filemap_populate]) LB_LINUX_TRY_COMPILE([ @@ -458,6 +314,9 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# +# added in 2.6.15 +# AC_DEFUN([LC_D_ADD_UNIQUE], [AC_MSG_CHECKING([for d_add_unique]) LB_LINUX_TRY_COMPILE([ @@ -472,6 +331,9 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# +# added in 2.6.17 +# AC_DEFUN([LC_BIT_SPINLOCK_H], [LB_CHECK_FILE([$LINUX/include/linux/bit_spinlock.h],[ AC_MSG_CHECKING([if bit_spinlock.h can be compiled]) @@ -490,9 +352,7 @@ AC_DEFUN([LC_BIT_SPINLOCK_H], ]) # -# LC_POSIX_ACL_XATTR -# -# If we have xattr_acl.h +# After 2.6.26 we no longer have xattr_acl.h # AC_DEFUN([LC_XATTR_ACL], [LB_CHECK_FILE([$LINUX/include/linux/xattr_acl.h],[ @@ -509,28 +369,10 @@ AC_DEFUN([LC_XATTR_ACL], []) ]) + # -# LC_LINUX_FIEMAP_H -# -# If we have fiemap.h -# after 2.6.27 use fiemap.h in include/linux +# added in 2.6.16 # -AC_DEFUN([LC_LINUX_FIEMAP_H], -[LB_CHECK_FILE([$LINUX/include/linux/fiemap.h],[ - AC_MSG_CHECKING([if fiemap.h can be compiled]) - LB_LINUX_TRY_COMPILE([ - #include - ],[],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h]) - ],[ - AC_MSG_RESULT([no]) - ]) -], -[]) -]) - - AC_DEFUN([LC_STRUCT_INTENT_FILE], [AC_MSG_CHECKING([if struct open_intent has a file field]) LB_LINUX_TRY_COMPILE([ @@ -548,6 +390,9 @@ LB_LINUX_TRY_COMPILE([ ]) +# +# After 2.6.16 the xattr_acl API is removed, and posix_acl is used instead +# AC_DEFUN([LC_POSIX_ACL_XATTR_H], [LB_CHECK_FILE([$LINUX/include/linux/posix_acl_xattr.h],[ AC_MSG_CHECKING([if linux/posix_acl_xattr.h can be compiled]) @@ -578,6 +423,9 @@ AC_DEFUN([LC_EXPORT___IGET], ]) ]) +# +# only for Lustre-patched kernels +# AC_DEFUN([LC_LUSTRE_VERSION_H], [LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ rm -f "$LUSTRE/include/linux/lustre_version.h" @@ -703,112 +551,6 @@ AC_DEFUN([LC_CONFIG_GSS], fi ]) -# LC_FUNC_MS_FLOCK_LOCK -# -# SLES9 kernel has MS_FLOCK_LOCK sb flag -# -AC_DEFUN([LC_FUNC_MS_FLOCK_LOCK], -[AC_MSG_CHECKING([if kernel has MS_FLOCK_LOCK sb flag]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int flags = MS_FLOCK_LOCK; -],[ - AC_DEFINE(HAVE_MS_FLOCK_LOCK, 1, - [kernel has MS_FLOCK_LOCK flag]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_HAVE_CAN_SLEEP_ARG -# -# SLES9 kernel has third arg can_sleep -# in fs/locks.c: flock_lock_file_wait() -# -AC_DEFUN([LC_FUNC_HAVE_CAN_SLEEP_ARG], -[AC_MSG_CHECKING([if kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int cansleep; - struct file *file; - struct file_lock *file_lock; - flock_lock_file_wait(file, file_lock, cansleep); -],[ - AC_DEFINE(HAVE_CAN_SLEEP_ARG, 1, - [kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_F_OP_FLOCK -# -# rhel4.2 kernel has f_op->flock field -# -AC_DEFUN([LC_FUNC_F_OP_FLOCK], -[AC_MSG_CHECKING([if struct file_operations has flock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations ll_file_operations_flock; - ll_file_operations_flock.flock = NULL; -],[ - AC_DEFINE(HAVE_F_OP_FLOCK, 1, - [struct file_operations has flock field]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_TASK_PPTR -# -# task struct has p_pptr instead of parent -# -AC_DEFUN([LC_TASK_PPTR], -[AC_MSG_CHECKING([task p_pptr found]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct *p; - - p = p->p_pptr; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_TASK_PPTR, 1, [task p_pptr found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_F_OP_FLOCK -# -# rhel4.2 kernel has f_op->flock field -# -AC_DEFUN([LC_FUNC_F_OP_FLOCK], -[AC_MSG_CHECKING([if struct file_operations has flock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations ll_file_operations_flock; - ll_file_operations_flock.flock = NULL; -],[ - AC_DEFINE(HAVE_F_OP_FLOCK, 1, - [struct file_operations has flock field]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # LC_EXPORT_SYNCHRONIZE_RCU # after 2.6.12 synchronize_rcu is preferred over synchronize_kernel AC_DEFUN([LC_EXPORT_SYNCHRONIZE_RCU], @@ -923,8 +665,7 @@ LB_LINUX_TRY_COMPILE([ # # LC_INVALIDATEPAGE_RETURN_INT -# more 2.6 api changes. return type for the invalidatepage -# address_space_operation is 'void' in new kernels but 'int' in old +# 2.6.17 changes return type for invalidatepage to 'void' from 'int' # AC_DEFUN([LC_INVALIDATEPAGE_RETURN_INT], [AC_MSG_CHECKING([invalidatepage has return int]) @@ -942,7 +683,7 @@ LB_LINUX_TRY_COMPILE([ ]) # LC_UMOUNTBEGIN_HAS_VFSMOUNT -# more 2.6 API changes. 2.6.18 umount_begin has different parameters +# after 2.6.18 umount_begin has different parameters AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT], [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block]) tmp_flags="$EXTRA_KCFLAGS" @@ -1134,8 +875,7 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# RHEL5 in FS-cache patch rename PG_checked flag -# into PG_fs_misc +# RHEL5 in FS-cache patch rename PG_checked flag into PG_fs_misc AC_DEFUN([LC_PG_FS_MISC], [AC_MSG_CHECKING([kernel has PG_fs_misc]) LB_LINUX_TRY_COMPILE([ @@ -1398,6 +1138,26 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# +# LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP +# +# Check for our patched grab_cache_page_nowait_gfp() function +# after 2.6.29 we can emulate this using add_to_page_cache_lru() +# +AC_DEFUN([LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP], +[LB_CHECK_SYMBOL_EXPORT([grab_cache_page_nowait_gfp], +[mm/filemap.c],[ + AC_DEFINE(HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP, 1, + [kernel exports grab_cache_page_nowait_gfp]) + ], + [LB_CHECK_SYMBOL_EXPORT([add_to_page_cache_lru], + [mm/filemap.c],[ + AC_DEFINE(HAVE_ADD_TO_PAGE_CACHE_LRU, 1, + [kernel exports add_to_page_cache_lru]) + ],[ + ]) + ]) +]) # ~2.6.12 merge patch from oracle to convert tree_lock from spinlock to rwlock AC_DEFUN([LC_RW_TREE_LOCK], @@ -1520,7 +1280,7 @@ LB_LINUX_TRY_COMPILE([ ]) # -# check for FS_RENAME_DOES_D_MOVE flag +# 2.6.19 check for FS_RENAME_DOES_D_MOVE flag # AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], [AC_MSG_CHECKING([if kernel has FS_RENAME_DOES_D_MOVE flag]) @@ -1559,23 +1319,38 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# Ensure stack size big than 8k in Lustre server -AC_DEFUN([LC_STACK_SIZE], -[AC_MSG_CHECKING([stack size big than 8k]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - #if THREAD_SIZE < 8192 - #error "stack size < 8192" - #endif -],[ - AC_MSG_RESULT(yes) +# 2.6.23 has new shrinker API +AC_DEFUN([LC_REGISTER_SHRINKER], +[LB_CHECK_SYMBOL_EXPORT([register_shrinker], +[mm/vmscan.c],[ + AC_DEFINE(HAVE_REGISTER_SHRINKER, 1, + [kernel exports register_shrinker]) ],[ - AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.]) ]) ]) # +# LC_LINUX_FIEMAP_H +# +# If we have fiemap.h +# after 2.6.27 use fiemap.h in include/linux +# +AC_DEFUN([LC_LINUX_FIEMAP_H], +[LB_CHECK_FILE([$LINUX/include/linux/fiemap.h],[ + AC_MSG_CHECKING([if fiemap.h can be compiled]) + LB_LINUX_TRY_COMPILE([ + #include + ],[],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h]) + ],[ + AC_MSG_RESULT([no]) + ]) +], +[]) +]) + +# # LC_PROG_LINUX # # Lustre linux kernel checks @@ -1584,6 +1359,7 @@ AC_DEFUN([LC_PROG_LINUX], [LC_LUSTRE_VERSION_H if test x$enable_server = xyes ; then AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) + LC_FUNC_DEV_SET_RDONLY LC_STACK_SIZE LC_CONFIG_BACKINGFS fi @@ -1605,15 +1381,8 @@ AC_DEFUN([LC_PROG_LINUX], LC_EXPORT_NODE_TO_CPUMASK LC_FUNC_RELEASEPAGE_WITH_INT - LC_HEADER_MM_INLINE - LC_STRUCT_INODE - LC_FUNC_REGISTER_CACHE LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP - LC_FUNC_DEV_SET_RDONLY - LC_FUNC_FILEMAP_FDATAWRITE LC_STRUCT_STATFS - LC_FUNC_PAGE_MAPPED - LC_STRUCT_FILE_OPS_UNLOCKED_IOCTL LC_FILEMAP_POPULATE LC_D_ADD_UNIQUE LC_BIT_SPINLOCK_H @@ -1629,7 +1398,6 @@ AC_DEFUN([LC_PROG_LINUX], LC_CONFIG_GSS LC_FUNC_MS_FLOCK_LOCK LC_FUNC_HAVE_CAN_SLEEP_ARG - LC_FUNC_F_OP_FLOCK LC_QUOTA_READ LC_COOKIE_FOLLOW_LINK LC_FUNC_RCU diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index 611e5be..83dd48a 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -282,32 +282,18 @@ static inline int mapping_has_pages(struct address_space *mapping) (type *)( (char *)__mptr - offsetof(type,member) );}) #endif -#ifdef HAVE_I_ALLOC_SEM -#define UP_WRITE_I_ALLOC_SEM(i) do { up_write(&(i)->i_alloc_sem); } while (0) -#define DOWN_WRITE_I_ALLOC_SEM(i) do { down_write(&(i)->i_alloc_sem); } while(0) +#define UP_WRITE_I_ALLOC_SEM(i) up_write(&(i)->i_alloc_sem) +#define DOWN_WRITE_I_ALLOC_SEM(i) down_write(&(i)->i_alloc_sem) #define LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i) LASSERT(down_read_trylock(&(i)->i_alloc_sem) == 0) -#define UP_READ_I_ALLOC_SEM(i) do { up_read(&(i)->i_alloc_sem); } while (0) -#define DOWN_READ_I_ALLOC_SEM(i) do { down_read(&(i)->i_alloc_sem); } while (0) +#define UP_READ_I_ALLOC_SEM(i) up_read(&(i)->i_alloc_sem) +#define DOWN_READ_I_ALLOC_SEM(i) down_read(&(i)->i_alloc_sem) #define LASSERT_I_ALLOC_SEM_READ_LOCKED(i) LASSERT(down_write_trylock(&(i)->i_alloc_sem) == 0) -#else -#define UP_READ_I_ALLOC_SEM(i) do { } while (0) -#define DOWN_READ_I_ALLOC_SEM(i) do { } while (0) -#define LASSERT_I_ALLOC_SEM_READ_LOCKED(i) do { } while (0) - -#define UP_WRITE_I_ALLOC_SEM(i) do { } while (0) -#define DOWN_WRITE_I_ALLOC_SEM(i) do { } while (0) -#define LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i) do { } while (0) -#endif #ifndef HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP #define grab_cache_page_nowait_gfp(x, y, z) grab_cache_page_nowait((x), (y)) #endif -#ifndef HAVE_FILEMAP_FDATAWRITE -#define filemap_fdatawrite(mapping) filemap_fdatasync(mapping) -#endif - #include /* for generic_writepages */ #ifndef HAVE_FILEMAP_FDATAWRITE_RANGE #include /* for mapping->backing_dev_info */ @@ -345,11 +331,10 @@ static inline int filemap_fdatawrite_range(struct address_space *mapping, #else int filemap_fdatawrite_range(struct address_space *mapping, loff_t start, loff_t end); -#endif +#endif /* HAVE_FILEMAP_FDATAWRITE_RANGE */ #ifdef HAVE_VFS_KERN_MOUNT -static inline -struct vfsmount * +static inline struct vfsmount * ll_kern_mount(const char *fstype, int flags, const char *name, void *data) { struct file_system_type *type = get_fs_type(fstype); @@ -370,11 +355,6 @@ ll_kern_mount(const char *fstype, int flags, const char *name, void *data) #define ll_do_statfs(sb, sfs) (sb)->s_op->statfs((sb), (sfs)) #endif -/* task_struct */ -#ifndef HAVE_TASK_PPTR -#define p_pptr parent -#endif - #ifndef HAVE_SB_TIME_GRAN #ifndef HAVE_S_TIME_GRAN #error Need s_time_gran patch! @@ -633,7 +613,7 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #define ll_security_inode_unlink(dir,entry,mnt) security_inode_unlink(dir,entry) #define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \ vfs_rename(old,old_dir,new,new_dir) -#endif +#endif /* HAVE_SECURITY_PLUG */ #ifndef for_each_possible_cpu #define for_each_possible_cpu(i) for_each_cpu(i) @@ -655,7 +635,7 @@ static inline long labs(long x) { return (x < 0) ? -x : x; } -#endif +#endif /* HAVE_REGISTER_SHRINKER */ /* Using kernel fls(). Userspace will use one defined in user-bitops.h. */ #ifndef __fls diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index 50faf6e..14f0f18 100644 --- a/lustre/llite/llite_internal.h +++ b/lustre/llite/llite_internal.h @@ -539,31 +539,6 @@ void ll_i2gids(__u32 *suppgids, struct inode *i1,struct inode *i2); extern cfs_mem_cache_t *ll_async_page_slab; extern size_t ll_async_page_slab_size; -#ifdef HAVE_REGISTER_CACHE -#include -#define ll_register_cache(cache) register_cache(cache) -#define ll_unregister_cache(cache) unregister_cache(cache) -#elif defined(HAVE_SHRINKER_CACHE) -struct cache_definition { - const char *name; - shrinker_t shrink; - struct shrinker *shrinker; -}; - -#define ll_register_cache(cache) do { \ - struct cache_definition *c = (cache); \ - c->shrinker = set_shrinker(DEFAULT_SEEKS, c->shrink); \ -} while(0) - -#define ll_unregister_cache(cache) do { \ - remove_shrinker((cache)->shrinker); \ - (cache)->shrinker = NULL; \ -} while(0) -#else -#define ll_register_cache(cache) do {} while (0) -#define ll_unregister_cache(cache) do {} while (0) -#endif - void ll_ra_read_in(struct file *f, struct ll_ra_read *rar); void ll_ra_read_ex(struct file *f, struct ll_ra_read *rar); struct ll_ra_read *ll_ra_read_get(struct file *f); @@ -713,6 +688,7 @@ void ll_lli_init(struct ll_inode_info *lli); int ll_fill_super(struct super_block *sb); void ll_put_super(struct super_block *sb); void ll_kill_super(struct super_block *sb); +int ll_shrink_cache(int nr_to_scan, gfp_t gfp_mask); struct inode *ll_inode_from_lock(struct ldlm_lock *lock); void ll_clear_inode(struct inode *inode); int ll_setattr_raw(struct inode *inode, struct iattr *attr); diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c index 3c74cfc..37ee5d4 100644 --- a/lustre/llite/lproc_llite.c +++ b/lustre/llite/lproc_llite.c @@ -704,7 +704,7 @@ void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count) sbi->ll_stats_track_id == current->pid) lprocfs_counter_add(sbi->ll_stats, op, count); else if (sbi->ll_stats_track_type == STATS_TRACK_PPID && - sbi->ll_stats_track_id == current->p_pptr->pid) + sbi->ll_stats_track_id == current->parent->pid) lprocfs_counter_add(sbi->ll_stats, op, count); else if (sbi->ll_stats_track_type == STATS_TRACK_GID && sbi->ll_stats_track_id == current->gid) -- 1.8.3.1