From 20a6f2df5afc45a764c6ffc842e33046531f9e5e Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 26 May 2009 18:30:19 +0000 Subject: [PATCH] b=17671 i=zhen.liang i=sheng.yang OFED 1.4.1 (rc6). --- lnet/ChangeLog | 2 +- lnet/autoconf/lustre-lnet.m4 | 8 ++- lustre/autoconf/lustre-core.m4 | 66 +++++++++++++++++++++- lustre/include/linux/lustre_compat25.h | 31 ++++++---- .../kernel-2.6.18-2.6-rhel5-i686-smp.config | 32 +---------- .../kernel-2.6.18-2.6-rhel5-i686.config | 32 +---------- .../kernel-2.6.18-2.6-rhel5-ia64-smp.config | 33 +---------- .../kernel-2.6.18-2.6-rhel5-ia64.config | 33 +---------- .../kernel-2.6.18-2.6-rhel5-ppc64-smp.config | 32 +---------- .../kernel-2.6.18-2.6-rhel5-ppc64.config | 32 +---------- .../kernel-2.6.18-2.6-rhel5-x86_64-smp.config | 33 +---------- .../kernel-2.6.18-2.6-rhel5-x86_64.config | 33 +---------- lustre/kernel_patches/targets/2.6-rhel4.target.in | 2 +- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/targets/2.6-sles10.target.in | 2 +- lustre/obdclass/capa.c | 4 +- 16 files changed, 121 insertions(+), 256 deletions(-) diff --git a/lnet/ChangeLog b/lnet/ChangeLog index 66fc8f9..9f06044 100644 --- a/lnet/ChangeLog +++ b/lnet/ChangeLog @@ -4,7 +4,7 @@ tbd Sun Microsystems, Inc. socklnd - any kernel supported by Lustre, qswlnd - Qsnet kernel modules 5.20 and later, openiblnd - IbGold 1.8.2, - o2iblnd - OFED 1.1, 1.2.0, 1.2.5, and 1.3 + o2iblnd - OFED 1.1, 1.2.0, 1.2.5, 1.3, and 1.4.1 viblnd - Voltaire ibhost 3.4.5 and later, ciblnd - Topspin 3.2.0, iiblnd - Infiniserv 3.3 + PathBits patch, diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 997c635..383516a 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -484,7 +484,8 @@ else O2IBCPPFLAGS="-I$O2IBPATH/include" EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="$EXTRA_KCFLAGS $O2IBCPPFLAGS" - EXTRA_LNET_INCLUDE="$O2IBCPPFLAGS $EXTRA_LNET_INCLUDE" + EXTRA_LNET_INCLUDE="$EXTRA_LNET_INCLUDE $O2IBCPPFLAGS" + LB_LINUX_TRY_COMPILE([ #include #include @@ -532,8 +533,13 @@ else if test -n $O2IB_SYMVER ; then AC_MSG_NOTICE([adding $O2IBPATH/$O2IB_SYMVER to $PWD/$SYMVERFILE]) # strip out the existing symbols versions first + if test -f $PWD/$SYMVERFILE; then egrep -v $(echo $(awk '{ print $2 }' $O2IBPATH/$O2IB_SYMVER) | tr ' ' '|') $PWD/$SYMVERFILE > $PWD/$SYMVERFILE.old + else + touch $PWD/$SYMVERFILE.old + fi cat $PWD/$SYMVERFILE.old $O2IBPATH/$O2IB_SYMVER > $PWD/$SYMVERFILE + rm $PWD/$SYMVERFILE.old else AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there]) fi diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 23fe3b7..0c07de1 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1455,9 +1455,11 @@ CFLAGS="$tmp_flags" AC_DEFUN([LC_ASYNC_BLOCK_CIPHER], [AC_MSG_CHECKING([if kernel has block cipher support]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - int v = CRYPTO_ALG_TYPE_BLKCIPHER; + struct crypto_blkcipher *tfm; + tfm = crypto_alloc_blkcipher("aes", 0, 0 ); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_ASYNC_BLOCK_CIPHER, 1, [kernel has block cipher support]) @@ -1467,6 +1469,42 @@ LB_LINUX_TRY_COMPILE([ ]) # +# check for struct hash_desc +# +AC_DEFUN([LC_STRUCT_HASH_DESC], +[AC_MSG_CHECKING([if kernel has struct hash_desc]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct hash_desc foo; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# check for struct blkcipher_desc +# +AC_DEFUN([LC_STRUCT_BLKCIPHER_DESC], +[AC_MSG_CHECKING([if kernel has struct blkcipher_desc]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct blkcipher_desc foo; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # check for FS_RENAME_DOES_D_MOVE flag # AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], @@ -1483,6 +1521,29 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# vfs_symlink seems to have started out with 3 args until 2.6.7 where a +# "mode" argument was added, but then again, in some later version it was +# removed +AC_DEFUN([LC_4ARGS_VFS_SYMLINK], +[AC_MSG_CHECKING([if vfs_symlink wants 4 args]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode *dir; + struct dentry *dentry; + const char *oldname = NULL; + int mode = 0; + + vfs_symlink(dir, dentry, oldname, mode); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_4ARGS_VFS_SYMLINK, 1, + [vfs_symlink wants 4 args]) +],[ + AC_MSG_RESULT(no) +]) +]) + # # LC_PROG_LINUX # @@ -1542,6 +1603,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_FUNC_RCU LC_PERCPU_COUNTER LC_QUOTA64 + LC_4ARGS_VFS_SYMLINK # does the kernel have VFS intent patches? LC_VFS_INTENT_PATCHES @@ -1594,6 +1656,8 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.22 LC_INVALIDATE_BDEV_2ARG LC_ASYNC_BLOCK_CIPHER + LC_STRUCT_HASH_DESC + LC_STRUCT_BLKCIPHER_DESC LC_FS_RENAME_DOES_D_MOVE # 2.6.23 LC_UNREGISTER_BLKDEV_RETURN_INT diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h index e06d907..277b8ce 100644 --- a/lustre/include/linux/lustre_compat25.h +++ b/lustre/include/linux/lustre_compat25.h @@ -253,22 +253,27 @@ static inline int mapping_has_pages(struct address_space *mapping) #define KIOBUF_GET_BLOCKS(k) ((k)->blocks) #endif +#ifdef HAVE_SECURITY_PLUG +#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ + vfs_symlink(dir, dentry, mnt, path, mode) +#else +#ifdef HAVE_4ARGS_VFS_SYMLINK +#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ + vfs_symlink(dir, dentry, path, mode) +#else +#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ + vfs_symlink(dir, dentry, path) +#endif +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7)) #define ll_set_dflags(dentry, flags) do { dentry->d_vfs_flags |= flags; } while(0) -#define ll_vfs_symlink(dir, dentry, path, mode) vfs_symlink(dir, dentry, path) #else #define ll_set_dflags(dentry, flags) do { \ spin_lock(&dentry->d_lock); \ dentry->d_flags |= flags; \ spin_unlock(&dentry->d_lock); \ } while(0) -#ifdef HAVE_SECURITY_PLUG -#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ - vfs_symlink(dir, dentry, mnt, path, mode) -#else -#define ll_vfs_symlink(dir, dentry, mnt, path, mode) \ - vfs_symlink(dir, dentry, path, mode) -#endif #endif #ifndef container_of @@ -461,12 +466,12 @@ static inline int ll_crypto_hmac(struct ll_crypto_hash *tfm, return crypto_hash_digest(&desc, sg, size, result); } static inline -unsigned int crypto_tfm_alg_max_keysize(struct crypto_blkcipher *tfm) +unsigned int ll_crypto_tfm_alg_max_keysize(struct crypto_blkcipher *tfm) { return crypto_blkcipher_tfm(tfm)->__crt_alg->cra_blkcipher.max_keysize; } static inline -unsigned int crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm) +unsigned int ll_crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm) { return crypto_blkcipher_tfm(tfm)->__crt_alg->cra_blkcipher.min_keysize; } @@ -481,15 +486,19 @@ unsigned int crypto_tfm_alg_min_keysize(struct crypto_blkcipher *tfm) #include #define ll_crypto_hash crypto_tfm #define ll_crypto_cipher crypto_tfm +#ifndef HAVE_STRUCT_HASH_DESC struct hash_desc { struct ll_crypto_hash *tfm; u32 flags; }; +#endif +#ifndef HAVE_STRUCT_BLKCIPHER_DESC struct blkcipher_desc { struct ll_crypto_cipher *tfm; void *info; u32 flags; }; +#endif #define ll_crypto_blkcipher_setkey(tfm, key, keylen) \ crypto_cipher_setkey(tfm, key, keylen) #define ll_crypto_blkcipher_set_iv(tfm, src, len) \ @@ -594,6 +603,8 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm, #define ll_crypto_hash_blocksize(tfm) crypto_tfm_alg_blocksize(tfm) #define ll_crypto_free_hash(tfm) crypto_free_tfm(tfm) #define ll_crypto_free_blkcipher(tfm) crypto_free_tfm(tfm) +#define ll_crypto_tfm_alg_min_keysize crypto_tfm_alg_min_keysize +#define ll_crypto_tfm_alg_max_keysize crypto_tfm_alg_max_keysize #endif /* HAVE_ASYNC_BLOCK_CIPHER */ #ifdef HAVE_SECURITY_PLUG diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config index 11f535b..97328b8 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686-smp.config @@ -1497,7 +1497,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1508,8 +1508,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2747,32 +2746,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config index 11f535b..97328b8 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config @@ -1497,7 +1497,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1508,8 +1508,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2747,32 +2746,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config index 8a6643e..a272203 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64-smp.config @@ -1251,7 +1251,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1262,8 +1262,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2410,33 +2409,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config index 8a6643e..a272203 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ia64.config @@ -1251,7 +1251,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1262,8 +1262,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2410,33 +2409,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config index 34e56ed..d8a493c 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64-smp.config @@ -1405,8 +1405,7 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2687,34 +2686,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_EHCA=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config index 34e56ed..d8a493c 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-ppc64.config @@ -1405,8 +1405,7 @@ CONFIG_S2IO_NAPI=y CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2687,34 +2686,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_EHCA=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config index df7872b..059d7a7 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config @@ -1420,7 +1420,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1431,8 +1431,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2648,33 +2647,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config index aef7183..1989337 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config @@ -1420,7 +1420,7 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T3=m +# CONFIG_CHELSIO_T3 is not set CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y @@ -1431,8 +1431,7 @@ CONFIG_ENIC=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y +# CONFIG_MLX4_CORE is not set # # Token Ring devices @@ -2648,33 +2647,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_MTHCA_DEBUG=y -CONFIG_INFINIBAND_IPATH=m -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_IPOIB=m -CONFIG_INFINIBAND_IPOIB_CM=y -CONFIG_INFINIBAND_IPOIB_DEBUG=y -# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -CONFIG_INFINIBAND_SDP=m -# CONFIG_INFINIBAND_SDP_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set -CONFIG_INFINIBAND_QLGC_VNIC_STATS=y -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in index 4822946..2f96002 100644 --- a/lustre/kernel_patches/targets/2.6-rhel4.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in @@ -9,7 +9,7 @@ RHBUILD=1 LINUX26=1 LUSTRE_VERSION=@VERSION@ -OFED_VERSION=1.3 +OFED_VERSION=1.4.1-rc4 BASE_ARCHS="i686 x86_64 ia64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index 23c2cc6..312d212 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -6,7 +6,7 @@ SERIES=2.6-rhel5.series EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ LUSTRE_VERSION=@VERSION@ -OFED_VERSION=inkernel +OFED_VERSION=1.4.1-rc6 BASE_ARCHS="i686 x86_64 ia64 ppc64" BIGMEM_ARCHS="" diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in index 23f34f9..9461f61 100644 --- a/lustre/kernel_patches/targets/2.6-sles10.target.in +++ b/lustre/kernel_patches/targets/2.6-sles10.target.in @@ -19,7 +19,7 @@ VERSION=$lnxmaj EXTRA_VERSION="${lnxrel}_lustre.@VERSION@" LUSTRE_VERSION=@VERSION@ -OFED_VERSION=1.3.1 +OFED_VERSION=1.4.1-rc6 BASE_ARCHS="i686 ppc x86_64 ia64 ppc64" BIGMEM_ARCHS="" diff --git a/lustre/obdclass/capa.c b/lustre/obdclass/capa.c index b73386f..ba47564 100644 --- a/lustre/obdclass/capa.c +++ b/lustre/obdclass/capa.c @@ -297,7 +297,7 @@ int capa_encrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen) RETURN(-EFAULT); } - min = crypto_tfm_alg_min_keysize(tfm); + min = ll_crypto_tfm_alg_min_keysize(tfm); if (keylen < min) { CERROR("keylen at least %d bits for aes\n", min * 8); GOTO(out, rc = -EINVAL); @@ -349,7 +349,7 @@ int capa_decrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen) RETURN(-EFAULT); } - min = crypto_tfm_alg_min_keysize(tfm); + min = ll_crypto_tfm_alg_min_keysize(tfm); if (keylen < min) { CERROR("keylen at least %d bits for aes\n", min * 8); GOTO(out, rc = -EINVAL); -- 1.8.3.1