From ba5dd769f66194a80920cf93d6014c78729efaae Mon Sep 17 00:00:00 2001 From: yangsheng Date: Thu, 11 Aug 2011 21:13:44 +0800 Subject: [PATCH] LU-674 kernel update RHEL5.7 [2.6.18-274.3.1.el5]. Test-Paramaters-Start: serverdistro=el5 clientdistro=el5 testgroup=regression Test-Paramaters-End: Change-Id: I4d080a22395ce11c43ba52d6bb3089761180a08a Signed-off-by: Yang Sheng Reviewed-on: http://review.whamcloud.com/1213 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Brian J. Murrell Reviewed-by: Johann Lombardi --- build/lbuild-rhel5 | 4 +- .../series/ldiskfs-2.6-rhel5-ext4.series | 1 - lustre/ChangeLog | 6 +- .../kernel-2.6.18-2.6-rhel5-i686.config | 22 ++++++- .../kernel-2.6.18-2.6-rhel5-x86_64.config | 23 ++++++- .../kernel_patches/patches/md-mmp-unplug-dev.patch | 2 +- .../patches/quota-large-limits-rhel5.patch | 70 ---------------------- .../patches/raid5-zerocopy-rhel5.patch | 21 +++---- lustre/kernel_patches/series/2.6-rhel5.series | 1 - lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 11 files changed, 56 insertions(+), 98 deletions(-) diff --git a/build/lbuild-rhel5 b/build/lbuild-rhel5 index 6190fcd..410485f 100644 --- a/build/lbuild-rhel5 +++ b/build/lbuild-rhel5 @@ -9,7 +9,7 @@ BUILD_GEN+=".0" source ${0%/*}/lbuild-rhel -SPEC_NAME="kernel-2.6.spec" +SPEC_NAME="kernel.spec" patch_spec() { local buildid="$1" @@ -18,7 +18,7 @@ patch_spec() { patch_spec_common "$buildid" sed -i -e '/^# empty final patch file to facilitate testing of kernel patches/i\ # adds Lustre patches\ -Patch99995: linux-%{kversion}-lustre.patch' \ +Patch99995: linux-%{version}-lustre.patch' \ -e '/^# conditionally applied test patch for debugging convenience/i\ # lustre patch\ %patch99995 -p1\ diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series index 0115583..b767923 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series @@ -28,7 +28,6 @@ ext4_data_in_dirent.patch ext4-extents-mount-option-rhel5.patch ext4-fiemap-2.6-rhel5.patch ext4-mballoc-skip-grps.patch -ext4-back-dquot-to-rhel54.patch ext4-disable-mb-cache-rhel5.patch ext4-remove-extents-warning-rhel5.patch ext4-disable-delalloc-rhel5.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 5d95365..dcb258e 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,12 +1,16 @@ xxxx-xx-xx Whamcloud, Inc. * version 1.8.6.80-wc1 * Support for kernels: - 2.6.18-238.12.1.el5 (RHEL 5) + 2.6.18-274.3.1.el5 (RHEL 5) 2.6.32-131.2.1.el6 (RHEL 6) - patchless client only * Recommended e2fsprogs version: 1.41.90.wc3 * Use ext4-based ldiskfs as default for RHEL5 * Add support for 24TB LUN (RHEL5 server only) +Severity : enhancement +Jira : LU-674 +Description: Add support for RHEL5.7 [2.6.18-274.3.1.el5] + ------------------------------------------------------------------------------- 2011-06-30 Whamcloud, Inc. 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 05154c0..757a773 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 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Sat Apr 23 03:57:21 2011 +# Thu Aug 11 21:10:01 2011 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -716,6 +716,7 @@ CONFIG_ATM_LANE=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set CONFIG_LLC=y @@ -1155,6 +1156,7 @@ CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -1185,6 +1187,7 @@ CONFIG_FCOE=m CONFIG_LIBISCSI1=m CONFIG_ISCSI_TCP=m CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m @@ -1227,6 +1230,10 @@ CONFIG_FCOE_FNIC=m # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +# CONFIG_PBG_HBA_BETA is not set +CONFIG_PBG_HBA_A2=y +# CONFIG_PBG_HBA_A0 is not set CONFIG_SCSI_IPS=m CONFIG_SCSI_INITIO=m # CONFIG_SCSI_INIA100 is not set @@ -1498,6 +1505,7 @@ CONFIG_E1000=m CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m +CONFIG_ATL1E=m CONFIG_IGB=m CONFIG_IGBVF=m CONFIG_IGB_DCA=y @@ -1522,6 +1530,8 @@ CONFIG_QLA3XXX=m CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4_DEPENDS=y +CONFIG_CHELSIO_T4=m CONFIG_IXGBE=m CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m @@ -1533,6 +1543,7 @@ CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m +CONFIG_MYRI10GE_DCA=y CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m @@ -1542,6 +1553,7 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_BNA=m CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -1996,8 +2008,9 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_UNIX98_PTYS=y -# CONFIG_LEGACY_PTYS is not set +CONFIG_LEGACY_PTYS=y CONFIG_CRASH=m +CONFIG_LEGACY_PTY_COUNT=0 CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m @@ -2259,6 +2272,7 @@ CONFIG_SENSORS_APPLESMC=m CONFIG_IBM_ASM=m CONFIG_EEPROM_93CX6=m CONFIG_HP_ILO=m +CONFIG_ENCLOSURE_SERVICES=m # # Multimedia devices @@ -2822,6 +2836,7 @@ CONFIG_INFINIBAND_MTHCA_DEBUG=y # CONFIG_INFINIBAND_AMSO1100 is not set CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set CONFIG_MLX4_INFINIBAND=m @@ -3043,7 +3058,6 @@ CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -CONFIG_NFS_FSCACHE=y CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=m CONFIG_NFSD_V3=y @@ -3244,6 +3258,7 @@ CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NHMAC=m CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -3276,6 +3291,7 @@ CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y +CONFIG_CRYPTO_XTS=m # # Random Number Generation 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 d800674..c1dc325 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 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Fri Apr 22 16:56:14 2011 +# Thu Aug 11 21:03:59 2011 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -661,6 +661,7 @@ CONFIG_ATM_LANE=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set CONFIG_LLC=y @@ -1096,6 +1097,7 @@ CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -1126,6 +1128,7 @@ CONFIG_FCOE=m CONFIG_LIBISCSI1=m CONFIG_ISCSI_TCP=m CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m @@ -1166,6 +1169,10 @@ CONFIG_FCOE_FNIC=m # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +# CONFIG_PBG_HBA_BETA is not set +CONFIG_PBG_HBA_A2=y +# CONFIG_PBG_HBA_A0 is not set CONFIG_SCSI_IPS=m CONFIG_SCSI_INITIO=m # CONFIG_SCSI_INIA100 is not set @@ -1432,6 +1439,7 @@ CONFIG_E1000=m CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m +CONFIG_ATL1E=m CONFIG_IGB=m CONFIG_IGBVF=m CONFIG_IGB_DCA=y @@ -1456,6 +1464,8 @@ CONFIG_QLA3XXX=m CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4_DEPENDS=y +CONFIG_CHELSIO_T4=m CONFIG_IXGBE=m CONFIG_IXGBE_DCA=y CONFIG_IXGBEVF=m @@ -1467,6 +1477,7 @@ CONFIG_VXGE=m # CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m +CONFIG_MYRI10GE_DCA=y CONFIG_NETXEN_NIC=m CONFIG_NIU=m CONFIG_BNX2X=m @@ -1476,6 +1487,7 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_BNA=m CONFIG_SFC=m CONFIG_SFC_MTD=y @@ -1917,8 +1929,9 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m CONFIG_UNIX98_PTYS=y -# CONFIG_LEGACY_PTYS is not set +CONFIG_LEGACY_PTYS=y CONFIG_CRASH=m +CONFIG_LEGACY_PTY_COUNT=0 CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m @@ -2170,6 +2183,7 @@ CONFIG_SENSORS_APPLESMC=m # CONFIG_IBM_ASM is not set CONFIG_EEPROM_93CX6=m CONFIG_HP_ILO=m +CONFIG_ENCLOSURE_SERVICES=m # # Multimedia devices @@ -2726,6 +2740,7 @@ CONFIG_INFINIBAND_IPATH=m # CONFIG_INFINIBAND_AMSO1100 is not set CONFIG_INFINIBAND_CXGB3=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set CONFIG_MLX4_INFINIBAND=m @@ -2751,6 +2766,7 @@ CONFIG_EDAC=y # Reporting subsystems # # CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=y CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_MCE=y CONFIG_EDAC_E752X=m @@ -2958,7 +2974,6 @@ CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -CONFIG_NFS_FSCACHE=y CONFIG_NFS_DIRECTIO=y CONFIG_NFSD=m CONFIG_NFSD_V3=y @@ -3152,6 +3167,7 @@ CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NHMAC=m CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -3184,6 +3200,7 @@ CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_SIGNATURE=y CONFIG_CRYPTO_SIGNATURE_DSA=y CONFIG_CRYPTO_MPILIB=y +CONFIG_CRYPTO_XTS=m # # Random Number Generation diff --git a/lustre/kernel_patches/patches/md-mmp-unplug-dev.patch b/lustre/kernel_patches/patches/md-mmp-unplug-dev.patch index 661e295..c601fb0 100644 --- a/lustre/kernel_patches/patches/md-mmp-unplug-dev.patch +++ b/lustre/kernel_patches/patches/md-mmp-unplug-dev.patch @@ -5,7 +5,7 @@ Index: linux-2.6.18-128.1.14/drivers/md/raid5.c @@ -1456,6 +1456,8 @@ bi->bi_next = *bip; *bip = bi; - bi->bi_phys_segments ++; + bi->bi_phys_segments++; + if (bio_sync(bi) && !forwrite) + clear_bit(R5_UPTODATE, &sh->dev[dd_idx].flags); /* force to read from disk. */ spin_unlock_irq(&conf->device_lock); diff --git a/lustre/kernel_patches/patches/quota-large-limits-rhel5.patch b/lustre/kernel_patches/patches/quota-large-limits-rhel5.patch index 1f11fcc..d53c809 100644 --- a/lustre/kernel_patches/patches/quota-large-limits-rhel5.patch +++ b/lustre/kernel_patches/patches/quota-large-limits-rhel5.patch @@ -1,73 +1,3 @@ -Index: linux-2.6.18-128.1.14/fs/dquot.c -=================================================================== ---- linux-2.6.18-128.1.14.orig/fs/dquot.c 2009-06-19 12:33:10.000000000 -0600 -+++ linux-2.6.18-128.1.14/fs/dquot.c 2009-06-19 12:35:20.000000000 -0600 -@@ -1592,10 +1592,19 @@ - } - - /* Generic routine for setting common part of quota structure */ --static void do_set_dqblk(struct dquot *dquot, struct if_dqblk *di) -+static int do_set_dqblk(struct dquot *dquot, struct if_dqblk *di) - { - struct mem_dqblk *dm = &dquot->dq_dqb; - int check_blim = 0, check_ilim = 0; -+ struct mem_dqinfo *dqi = &sb_dqopt(dquot->dq_sb)->info[dquot->dq_type]; -+ -+ if ((di->dqb_valid & QIF_BLIMITS && -+ (di->dqb_bhardlimit > dqi->dqi_maxblimit || -+ di->dqb_bsoftlimit > dqi->dqi_maxblimit)) || -+ (di->dqb_valid & QIF_ILIMITS && -+ (di->dqb_ihardlimit > dqi->dqi_maxilimit || -+ di->dqb_isoftlimit > dqi->dqi_maxilimit))) -+ return -ERANGE; - - spin_lock(&dq_data_lock); - if (di->dqb_valid & QIF_SPACE) { -@@ -1627,7 +1636,7 @@ - clear_bit(DQ_BLKS_B, &dquot->dq_flags); - } - else if (!(di->dqb_valid & QIF_BTIME)) /* Set grace only if user hasn't provided his own... */ -- dm->dqb_btime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_bgrace; -+ dm->dqb_btime = get_seconds() + dqi->dqi_bgrace; - } - if (check_ilim) { - if (!dm->dqb_isoftlimit || dm->dqb_curinodes < dm->dqb_isoftlimit) { -@@ -1635,7 +1644,7 @@ - clear_bit(DQ_INODES_B, &dquot->dq_flags); - } - else if (!(di->dqb_valid & QIF_ITIME)) /* Set grace only if user hasn't provided his own... */ -- dm->dqb_itime = get_seconds() + sb_dqopt(dquot->dq_sb)->info[dquot->dq_type].dqi_igrace; -+ dm->dqb_itime = get_seconds() + dqi->dqi_igrace; - } - if (dm->dqb_bhardlimit || dm->dqb_bsoftlimit || dm->dqb_ihardlimit || dm->dqb_isoftlimit) - clear_bit(DQ_FAKE_B, &dquot->dq_flags); -@@ -1643,21 +1652,24 @@ - set_bit(DQ_FAKE_B, &dquot->dq_flags); - spin_unlock(&dq_data_lock); - mark_dquot_dirty(dquot); -+ -+ return 0; - } - - int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, struct if_dqblk *di) - { - struct dquot *dquot; -+ int rc; - - mutex_lock(&sb_dqopt(sb)->dqonoff_mutex); - if (!(dquot = dqget(sb, id, type))) { - mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex); - return -ESRCH; - } -- do_set_dqblk(dquot, di); -+ rc = do_set_dqblk(dquot, di); - dqput(dquot); - mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex); -- return 0; -+ return rc; - } - - /* Generic routine for getting common part of quota file information */ Index: linux-2.6.18-128.1.14/fs/quota_v1.c =================================================================== --- linux-2.6.18-128.1.14.orig/fs/quota_v1.c 2009-06-19 12:33:10.000000000 -0600 diff --git a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch index e0d3d45..4fd66a6 100644 --- a/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch +++ b/lustre/kernel_patches/patches/raid5-zerocopy-rhel5.patch @@ -351,30 +351,23 @@ Index: linux-2.6.18-128.1.14/include/linux/backing-dev.h --- linux-2.6.18-128.1.14.orig/include/linux/backing-dev.h 2009-06-19 12:33:11.000000000 -0600 +++ linux-2.6.18-128.1.14/include/linux/backing-dev.h 2009-06-19 12:34:50.000000000 -0600 @@ -48,6 +48,7 @@ - #define BDI_CAP_READ_MAP 0x00000010 /* Can be mapped for reading */ - #define BDI_CAP_WRITE_MAP 0x00000020 /* Can be mapped for writing */ - #define BDI_CAP_EXEC_MAP 0x00000040 /* Can be mapped for execution */ -+#define BDI_CAP_PAGE_CONSTANT_WRITE 0x00000080 /* Zcopy write - for raid5 */ + #define BDI_CAP_THROTTLE_DIRTY 0x00010000 /* throttle in balance_dirty_pages when BDI is congested */ #define BDI_CAP_VMFLAGS \ (BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP) ++#define BDI_CAP_PAGE_CONSTANT_WRITE 0x00000080 /* Zcopy write - for raid5 */ -@@ -94,11 +95,18 @@ - #define bdi_cap_account_dirty(bdi) \ - (!((bdi)->capabilities & BDI_CAP_NO_ACCT_DIRTY)) + #if defined(VM_MAYREAD) && \ + (BDI_CAP_READ_MAP != VM_MAYREAD || \ +@@ -94,5 +95,11 @@ + #define mapping_cap_account_dirty(mapping) \ + bdi_cap_account_dirty((mapping)->backing_dev_info) +#define bdi_cap_page_constant_write(bdi) \ + ((bdi)->capabilities & BDI_CAP_PAGE_CONSTANT_WRITE) + - #define mapping_cap_writeback_dirty(mapping) \ - bdi_cap_writeback_dirty((mapping)->backing_dev_info) - - #define mapping_cap_account_dirty(mapping) \ - bdi_cap_account_dirty((mapping)->backing_dev_info) - +#define mapping_cap_page_constant_write(mapping) \ + bdi_cap_page_constant_write((mapping)->backing_dev_info) + -+ #endif /* _LINUX_BACKING_DEV_H */ Index: linux-2.6.18-128.1.14/include/linux/page-flags.h diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series index 5f60cc2..2103fec 100644 --- a/lustre/kernel_patches/series/2.6-rhel5.series +++ b/lustre/kernel_patches/series/2.6-rhel5.series @@ -25,4 +25,3 @@ mpt-fusion-max-sge.patch jbd2-jcberr-2.6-rhel5.patch jbd2-commit-timer-no-jiffies-rounding.diff md-avoid-bug_on-when-bmc-overflow.patch -jbd2_stats_proc_init-wrong-place.patch diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index 814bfa0..af3fdaa 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.18" -lnxrel="238.12.1.el5" +lnxrel="274.3.1.el5" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel5.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index f50875c..01c9004 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,7 +1,7 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel5 RHEL5: 2.6.18-238.12.1.el5 +2.6-rhel5 RHEL5: 2.6.18-274.3.1.el5 CLIENT SUPPORT FOR UNPATCHED KERNELS: kernel.org 2.6.16-2.6.32 -- 1.8.3.1