From 50ff547094679f953ff38a19d6d776e856aa677a Mon Sep 17 00:00:00 2001 From: yangsheng Date: Tue, 12 Oct 2010 23:50:36 +0800 Subject: [PATCH] b=20744 Update SLES10 SP3 kernel 2.6.16.60-0.69.1. i=johann i=brian --- build/lbuild-sles10 | 2 + .../ext3-block-bitmap-validation-2.6-sles10.patch | 19 ---- .../patches/ext3-extents-2.6.16-sles10.patch | 4 +- .../patches/ext3-extents-search-2.6.9-rhel4.patch | 2 +- .../patches/ext3-inode-version-2.6-sles10.patch | 6 +- .../patches/ext3-mballoc3-2.6.18.patch | 15 --- .../patches/ext3-mballoc3-core.patch | 4 +- .../patches/ext3-mballoc3-sles10.patch | 65 +++++++++-- .../patches/ext3-statfs-2.6-sles10.patch | 4 +- .../patches/ext3-uninit-2.6-sles10.patch | 2 +- .../series/ldiskfs-2.6-sles10.series | 1 - .../kernel-2.6.16-2.6-sles10-i686-bigsmp.config | 88 +++++++++------ .../kernel-2.6.16-2.6-sles10-i686.config | 94 +++++++++------- .../kernel-2.6.16-2.6-sles10-x86_64-smp.config | 77 ++++++++----- .../kernel-2.6.16-2.6-sles10-x86_64.config | 123 ++++++++++++++------- lustre/kernel_patches/targets/2.6-sles10.target.in | 2 +- lustre/lvfs/fsfilt_ext3.c | 4 + 17 files changed, 313 insertions(+), 199 deletions(-) diff --git a/build/lbuild-sles10 b/build/lbuild-sles10 index 6330d1c..28bbcf4 100644 --- a/build/lbuild-sles10 +++ b/build/lbuild-sles10 @@ -27,6 +27,8 @@ cp %_sourcedir/linux-2.6.16-lustre.patch %_builddir/%{name}-%{version}/lustre.p ! grep -q lustre.patch %_sourcedir/series.conf && echo -e "\\n\\tlustre.patch" >> %_sourcedir/series.conf' \ -e "/flavor=\${config/a\ [ \"\$flavor\" == \"$RPMSMPTYPE\" ] || continue" \ + -e "s/^\(BuildRequires: kernel-dummy\)/# \1/" \ + -e "s/kernel-dummy\.spec/ /g" \ SOURCES/kernel-${spec}.spec || fatal 1 "Error while editing SOURCES/kernel-${spec}.spec" if $KERNEL_LUSTRE_NAMING; then diff --git a/ldiskfs/kernel_patches/patches/ext3-block-bitmap-validation-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-block-bitmap-validation-2.6-sles10.patch index 417591d..36f22ff 100644 --- a/ldiskfs/kernel_patches/patches/ext3-block-bitmap-validation-2.6-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-block-bitmap-validation-2.6-sles10.patch @@ -167,22 +167,3 @@ Index: linux-stage/fs/ext3/balloc.c return bh; } /* -Index: linux-stage/include/linux/ext3_fs.h -=================================================================== ---- linux-stage.orig/include/linux/ext3_fs.h -+++ linux-stage/include/linux/ext3_fs.h -@@ -872,6 +872,14 @@ struct dir_private_info { - __u32 next_hash; - }; - -+/* calculate the first block number of the group */ -+static inline long long -+ext3_group_first_block_no(struct super_block *sb, unsigned long group_no) -+{ -+ return group_no * (long long)EXT3_BLOCKS_PER_GROUP(sb) + -+ le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block); -+} -+ - /* - * Special error return code only used by dx_probe() and its callers. - */ diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch index 6298a2a..9f16de7 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.16-sles10.patch @@ -2518,9 +2518,9 @@ Index: linux-2.6.16.54-0.2.5/include/linux/ext3_fs.h /* inode.c */ +extern int ext3_block_truncate_page(handle_t *, struct page *, struct address_space *, loff_t); - int ext3_forget(handle_t *, int, struct inode *, struct buffer_head *, int); + int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode, + struct buffer_head *bh, ext3_fsblk_t blocknr); struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *); - struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *); @@ -804,6 +810,7 @@ extern int ext3_get_inode_loc(struct ino extern void ext3_truncate (struct inode *); extern void ext3_set_inode_flags(struct inode *); diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-search-2.6.9-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-extents-search-2.6.9-rhel4.patch index 2ad69c8..9c10852 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-search-2.6.9-rhel4.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-search-2.6.9-rhel4.patch @@ -75,7 +75,7 @@ Index: linux-2.6.9-full/fs/ext3/extents.c +{ + struct buffer_head *bh = NULL; + struct ext3_extent_header *eh; -+ struct ext3_extent_idx *ix; ++ struct ext3_extent_idx *ix = NULL; + struct ext3_extent *ex; + unsigned long block; + int depth; diff --git a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch index 63e6ad2..e0cfa71 100644 --- a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6-sles10.patch @@ -118,9 +118,9 @@ Index: linux-2.6.16-sles10/include/linux/ext3_fs_i.h __u32 _rsv_start; /* First byte reserved */ __u32 _rsv_end; /* Last byte reserved or 0 */ @@ -142,6 +144,8 @@ struct ext3_inode_info { + /* mballoc */ + struct list_head i_prealloc_list; spinlock_t i_prealloc_lock; - - void *i_filterdata; + + __u64 i_fs_version; }; @@ -292,7 +292,7 @@ Index: linux-2.6.16-sles10/fs/ext3/xattr.c + if (ext3_xattr_check_block(bh)) { + ext3_error(inode->i_sb, __FUNCTION__, + "inode %lu: bad block %d", inode->i_ino, -+ EXT3_I(inode)->i_file_acl); ++ (int)EXT3_I(inode)->i_file_acl); + error = -EIO; + goto cleanup; + } diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.18.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.18.patch index bc93136..fcecb8c 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.18.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.18.patch @@ -580,21 +580,6 @@ Index: linux-2.6.18.8/fs/ext3/mballoc.c return block; } -@@ -4135,11 +4135,11 @@ out: - } - EXPORT_SYMBOL(ext3_mb_new_blocks); - --int ext3_new_block(handle_t *handle, struct inode *inode, -- unsigned long goal, int *errp) -+ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode, -+ ext3_fsblk_t goal, int *errp) - { - struct ext3_allocation_request ar; -- unsigned long ret; -+ ext3_fsblk_t ret; - - if (!test_opt(inode->i_sb, MBALLOC)) { - ret = ext3_new_block_old(handle, inode, goal, errp); @@ -4254,8 +4254,8 @@ int ext3_mb_free_metadata(handle_t *hand * Main entry point into mballoc to free blocks */ diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch index a896155..2e04388 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch @@ -4515,11 +4515,11 @@ Index: linux-2.6.22.19/fs/ext3/mballoc.c +} +EXPORT_SYMBOL(ext3_mb_new_blocks); + -+int ext3_new_block(handle_t *handle, struct inode *inode, ++ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode, + unsigned long goal, int *errp) +{ + struct ext3_allocation_request ar; -+ unsigned long ret; ++ ext3_fsblk_t ret; + + if (!test_opt(inode->i_sb, MBALLOC)) { + ret = ext3_new_block_old(handle, inode, goal, errp); diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch index 6301402..90e4552 100644 --- a/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-mballoc3-sles10.patch @@ -17,10 +17,10 @@ Index: linux-2.6.16.46-0.14/include/linux/ext3_fs_sb.h =================================================================== --- linux-2.6.16.46-0.14.orig/include/linux/ext3_fs_sb.h +++ linux-2.6.16.46-0.14/include/linux/ext3_fs_sb.h -@@ -21,8 +21,15 @@ +@@ -21,8 +21,16 @@ #include #include - #include + #include +#include #endif #include @@ -30,6 +30,7 @@ Index: linux-2.6.16.46-0.14/include/linux/ext3_fs_sb.h +struct ext3_locality_group; +struct ext3_mb_history; +#define EXT3_BB_MAX_BLOCKS ++#define EXT3_SBI_WITH_COUNTER64 1 /* * third extended-fs super-block data in memory @@ -48,14 +49,23 @@ Index: linux-2.6.16.46-0.14/include/linux/ext3_fs.h @@ -784,8 +785,9 @@ struct dir_private_info { extern int ext3_bg_has_super(struct super_block *sb, int group); extern unsigned long ext3_bg_num_gdb(struct super_block *sb, int group); - extern int ext3_new_block (handle_t *, struct inode *, unsigned long, int *); -+extern int ext3_new_block_old (handle_t *, struct inode *, unsigned long, int *); - extern void ext3_free_blocks (handle_t *, struct inode *, unsigned long, + extern ext3_fsblk_t ext3_new_block (handle_t *, struct inode *, ext3_fsblk_t, int *); ++extern ext3_fsblk_t ext3_new_block_old (handle_t *, struct inode *, ext3_fsblk_t, int *); + extern void ext3_free_blocks (handle_t *, struct inode *, ext3_fsblk_t, - unsigned long); + unsigned long, int); extern void ext3_free_blocks_sb (handle_t *, struct super_block *, unsigned long, unsigned long, int *); extern unsigned long ext3_count_free_blocks (struct super_block *); +@@ -784,7 +785,7 @@ struct dir_private_info { + extern void ext3_mb_discard_inode_preallocations(struct inode *); + extern int __init init_ext3_mb_proc(void); + extern void exit_ext3_mb_proc(void); +-extern void ext3_mb_free_blocks(handle_t *, struct inode *, unsigned long, unsigned long, int, int *); ++extern void ext3_mb_free_blocks(handle_t *, struct inode *, unsigned long, unsigned long, int, unsigned long *); + + + /* inode.c */ Index: linux-2.6.16.46-0.14/fs/ext3/super.c =================================================================== --- linux-2.6.16.46-0.14.orig/fs/ext3/super.c @@ -307,14 +317,14 @@ Index: linux-2.6.16.46-0.14/fs/ext3/balloc.c -/* Free given blocks, update quota and i_blocks field */ -void ext3_free_blocks(handle_t *handle, struct inode *inode, -- unsigned long block, unsigned long count) +- ext3_fsblk_t block, unsigned long count) +void ext3_free_blocks(handle_t *handle, struct inode * inode, -+ unsigned long block, unsigned long count, int metadata) ++ ext3_fsblk_t block, unsigned long count, int metadata) { - struct super_block * sb; -- int dquot_freed_blocks; +- unsigned long dquot_freed_blocks; + struct super_block *sb; -+ int freed; ++ unsigned long freed; + + /* this isn't the right place to decide whether block is metadata + * inode.c/extents.c knows better, but for safety ... */ @@ -343,9 +353,9 @@ Index: linux-2.6.16.46-0.14/fs/ext3/balloc.c * bitmap, and then for any free bit if that fails. * This function also updates quota and i_blocks field. */ --int ext3_new_block(handle_t *handle, struct inode *inode, -+int ext3_new_block_old(handle_t *handle, struct inode *inode, - unsigned long goal, int *errp) +-ext3_fsblk_t ext3_new_block(handle_t *handle, struct inode *inode, ++ext3_fsblk_t ext3_new_block_old(handle_t *handle, struct inode *inode, + ext3_fsblk_t goal, int *errp) { struct buffer_head *bitmap_bh = NULL; Index: linux-2.6.16.46-0.14/fs/ext3/inode.c @@ -379,3 +389,34 @@ Index: linux-2.6.16.46-0.14/fs/ext3/inode.c if (parent_bh) { /* +Index: linux-2.6.16.46-0.14/fs/ext3/mballoc.c +=================================================================== +--- linux-2.6.16.46-0.14.orig/fs/ext3/mballoc.c ++++ linux-2.6.16.46-0.14/fs/ext3/mballoc.c +@@ -569,7 +569,7 @@ + cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count) + - ac->ac_b_ex.fe_len); + spin_unlock(sb_bgl_lock(sbi, ac->ac_b_ex.fe_group)); +- percpu_counter_mod(&sbi->s_freeblocks_counter, - ac->ac_b_ex.fe_len); ++ percpu_counter64_mod(&sbi->s_freeblocks_counter, - ac->ac_b_ex.fe_len); + ext3_unlock_group(sb, ac->ac_b_ex.fe_group); + + err = ext3_journal_dirty_metadata(handle, bitmap_bh); +@@ -769,7 +769,7 @@ + */ + void ext3_mb_free_blocks(handle_t *handle, struct inode *inode, + unsigned long block, unsigned long count, +- int metadata, int *freed) ++ int metadata, unsigned long *freed) + { + struct buffer_head *bitmap_bh = NULL; + struct super_block *sb = inode->i_sb; +@@ -1569,7 +1569,7 @@ + gdp->bg_free_blocks_count = + cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count) + count); + spin_unlock(sb_bgl_lock(sbi, block_group)); +- percpu_counter_mod(&sbi->s_freeblocks_counter, count); ++ percpu_counter64_mod(&sbi->s_freeblocks_counter, count); + + if (metadata) { + /* blocks being freed are metadata. these blocks shouldn't diff --git a/ldiskfs/kernel_patches/patches/ext3-statfs-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-statfs-2.6-sles10.patch index 1e1a4db..73b3520 100644 --- a/ldiskfs/kernel_patches/patches/ext3-statfs-2.6-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-statfs-2.6-sles10.patch @@ -3,10 +3,10 @@ Index: linux-2.6.16.46-0.14/fs/ext3/super.c --- linux-2.6.16.46-0.14.orig/fs/ext3/super.c +++ linux-2.6.16.46-0.14/fs/ext3/super.c @@ -2908,18 +2908,19 @@ restore_opts: - static int ext3_statfs (struct super_block * sb, struct kstatfs * buf) { + struct super_block *sb = dentry->d_sb; struct ext3_super_block *es = EXT3_SB(sb)->s_es; -- unsigned long overhead; +- ext3_fsblk_t overhead; - int i; + struct ext3_sb_info *sbi = EXT3_SB(sb); diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch index d001841..feeed5d 100644 --- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch @@ -213,7 +213,7 @@ Index: linux-2.6.16.60-0.27/fs/ext3/super.c + le16_to_cpu(gdp->bg_checksum)); + return 0; + } - block += EXT3_BLOCKS_PER_GROUP(sb); + first_block += EXT3_BLOCKS_PER_GROUP(sb); gdp++; } Index: linux-2.6.16.60-0.27/fs/ext3/group.h diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series index 23a2d31..736f67d 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series @@ -12,7 +12,6 @@ ext3-mballoc3-core.patch ext3-mballoc3-sles10.patch ext3-nlinks-2.6.9.patch ext3-remove-cond_resched-calls-2.6.12.patch -ext3-filterdata-sles10.patch ext3-disable-write-bar-by-default-2.6-sles10.patch ext3-uninit-2.6-sles10.patch ext3-nanosecond-2.6-sles10.patch diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config index 71f99af..182489a 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686-bigsmp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.60 -# Wed May 21 20:30:49 2008 +# Tue Oct 12 22:25:05 2010 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -22,11 +22,11 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-bigsmp" CONFIG_LOCALVERSION_AUTO=y CONFIG_SUSE_KERNEL=y CONFIG_SLE_VERSION=10 -CONFIG_SLE_SP=2 +CONFIG_SLE_SP=3 CONFIG_SLE_SP_SUBLEVEL=0 CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -36,6 +36,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -94,10 +95,10 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="deadline" # # Processor type and features @@ -158,8 +159,8 @@ CONFIG_SMP_ALTERNATIVES=y CONFIG_NR_CPUS=128 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_BKL is not set CONFIG_X86_LOCAL_APIC=y @@ -197,6 +198,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -221,8 +223,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set -CONFIG_SOFTWARE_SUSPEND=y -CONFIG_PM_STD_PARTITION="" +# CONFIG_SOFTWARE_SUSPEND is not set CONFIG_SUSPEND_SMP=y # @@ -1202,17 +1203,17 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set CONFIG_ISCSI_TARGET=m # # SCSI low-level drivers # -# CONFIG_ISCSI_TCP is not set +CONFIG_ISCSI_TCP=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_7000FASST=m @@ -1235,7 +1236,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_SCSI_AIC94XX=m -CONFIG_AIC94XX_DEBUG=y +# CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_IN2000=m @@ -1245,6 +1246,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set @@ -1282,8 +1286,9 @@ CONFIG_SCSI_QLOGIC_FC=m CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m +CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -1299,11 +1304,16 @@ CONFIG_SCSI_DEBUG=m # # PCMCIA SCSI adapter support # -# CONFIG_PCMCIA_AHA152X is not set +CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m # # Serial ATA (prod) and Parallel ATA (experimental) drivers @@ -1399,10 +1409,6 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_HP_SW=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_ALUA=m CONFIG_DM_NL_EVT=y CONFIG_FUSION=y CONFIG_FUSION_SPI=m @@ -1412,7 +1418,7 @@ CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_MAX_FC_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # IEEE 1394 (FireWire) support @@ -1564,6 +1570,7 @@ CONFIG_AC3200=m CONFIG_APRICOT=m CONFIG_B44=m CONFIG_FORCEDETH=m +CONFIG_FORCEDETH_NEW=m CONFIG_CS89x0=m CONFIG_DGRS=m CONFIG_EEPRO100=m @@ -1598,12 +1605,13 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000E=m CONFIG_IGB=m CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set +CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m @@ -1619,15 +1627,22 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m -# CONFIG_IXGBE_NAPI is not set +CONFIG_IXGBE_NAPI=y CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_QLGE=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BNA=m CONFIG_MYRI10GE=m +CONFIG_BE2NET=m # # Token Ring devices @@ -2083,8 +2098,8 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set -CONFIG_SERIAL_8250_NR_UARTS=8 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=8 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y @@ -3143,7 +3158,14 @@ CONFIG_MMC_TIFM_SD=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_INFINIBAND_SRP=m # # DMA Engine support @@ -3310,8 +3332,10 @@ CONFIG_SMB_NLS_REMOTE="cp850" CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y @@ -3324,8 +3348,7 @@ CONFIG_NCPFS_NLS=y CONFIG_NCPFS_EXTRAS=y CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set -CONFIG_AFS_FS=m -CONFIG_RXRPC=m +# CONFIG_AFS_FS is not set CONFIG_9P_FS=m CONFIG_GENERIC_ACL=y @@ -3428,10 +3451,6 @@ CONFIG_RCU_TORTURE_TEST=m CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACK_USAGE is not set - -# -# Page alloc debug is incompatible with Software Suspend on i386 -# # CONFIG_DEBUG_RODATA is not set # CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y @@ -3441,7 +3460,8 @@ CONFIG_X86_MPPARSE=y # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config index ea7c80f..182489a 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.60 -# Wed May 21 20:31:52 2008 +# Tue Oct 12 22:25:05 2010 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -22,11 +22,11 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="-bigsmp" CONFIG_LOCALVERSION_AUTO=y CONFIG_SUSE_KERNEL=y CONFIG_SLE_VERSION=10 -CONFIG_SLE_SP=2 +CONFIG_SLE_SP=3 CONFIG_SLE_SP_SUBLEVEL=0 CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -36,6 +36,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -94,10 +95,10 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="deadline" # # Processor type and features @@ -158,8 +159,8 @@ CONFIG_SMP_ALTERNATIVES=y CONFIG_NR_CPUS=128 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_BKL is not set CONFIG_X86_LOCAL_APIC=y @@ -197,6 +198,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y @@ -221,8 +223,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set -CONFIG_SOFTWARE_SUSPEND=y -CONFIG_PM_STD_PARTITION="" +# CONFIG_SOFTWARE_SUSPEND is not set CONFIG_SUSPEND_SMP=y # @@ -1202,17 +1203,17 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set CONFIG_ISCSI_TARGET=m # # SCSI low-level drivers # -# CONFIG_ISCSI_TCP is not set +CONFIG_ISCSI_TCP=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_7000FASST=m @@ -1235,7 +1236,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_SCSI_AIC94XX=m -CONFIG_AIC94XX_DEBUG=y +# CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_IN2000=m @@ -1245,6 +1246,9 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set @@ -1282,8 +1286,9 @@ CONFIG_SCSI_QLOGIC_FC=m CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m +CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -1299,11 +1304,16 @@ CONFIG_SCSI_DEBUG=m # # PCMCIA SCSI adapter support # -# CONFIG_PCMCIA_AHA152X is not set +CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m # # Serial ATA (prod) and Parallel ATA (experimental) drivers @@ -1399,10 +1409,6 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_HP_SW=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_ALUA=m CONFIG_DM_NL_EVT=y CONFIG_FUSION=y CONFIG_FUSION_SPI=m @@ -1412,7 +1418,7 @@ CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_MAX_FC_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # IEEE 1394 (FireWire) support @@ -1564,6 +1570,7 @@ CONFIG_AC3200=m CONFIG_APRICOT=m CONFIG_B44=m CONFIG_FORCEDETH=m +CONFIG_FORCEDETH_NEW=m CONFIG_CS89x0=m CONFIG_DGRS=m CONFIG_EEPRO100=m @@ -1598,12 +1605,13 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000E=m CONFIG_IGB=m CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set +CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m @@ -1619,15 +1627,22 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m -# CONFIG_IXGBE_NAPI is not set +CONFIG_IXGBE_NAPI=y CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_QLGE=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BNA=m CONFIG_MYRI10GE=m +CONFIG_BE2NET=m # # Token Ring devices @@ -2083,8 +2098,8 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set -CONFIG_SERIAL_8250_NR_UARTS=8 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=8 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y @@ -3143,7 +3158,14 @@ CONFIG_MMC_TIFM_SD=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_INFINIBAND_SRP=m # # DMA Engine support @@ -3310,8 +3332,10 @@ CONFIG_SMB_NLS_REMOTE="cp850" CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y @@ -3324,8 +3348,7 @@ CONFIG_NCPFS_NLS=y CONFIG_NCPFS_EXTRAS=y CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set -CONFIG_AFS_FS=m -CONFIG_RXRPC=m +# CONFIG_AFS_FS is not set CONFIG_9P_FS=m CONFIG_GENERIC_ACL=y @@ -3428,10 +3451,6 @@ CONFIG_RCU_TORTURE_TEST=m CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACK_USAGE is not set - -# -# Page alloc debug is incompatible with Software Suspend on i386 -# # CONFIG_DEBUG_RODATA is not set # CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y @@ -3441,7 +3460,8 @@ CONFIG_X86_MPPARSE=y # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set @@ -3455,11 +3475,11 @@ CONFIG_SECURITY_APPARMOR=m # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ABLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config index e4af959..b352f8d 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64-smp.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.60 -# Wed May 21 20:28:50 2008 +# Wed Aug 25 00:08:21 2010 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -28,11 +28,11 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +CONFIG_LOCALVERSION="-smp" +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SUSE_KERNEL=y CONFIG_SLE_VERSION=10 -CONFIG_SLE_SP=2 +CONFIG_SLE_SP=3 CONFIG_SLE_SP_SUBLEVEL=0 CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -42,6 +42,7 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -100,10 +101,10 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="deadline" # # Processor type and features @@ -149,6 +150,7 @@ CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=0 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y CONFIG_NR_CPUS=128 CONFIG_HOTPLUG_CPU=y @@ -1095,17 +1097,17 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set CONFIG_ISCSI_TARGET=m # # SCSI low-level drivers # -# CONFIG_ISCSI_TCP is not set +CONFIG_ISCSI_TCP=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1125,13 +1127,16 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_SCSI_AIC94XX=m -CONFIG_AIC94XX_DEBUG=y +# CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_ARCMSR=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set @@ -1159,8 +1164,9 @@ CONFIG_SCSI_QLOGIC_FC=m CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m +CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m CONFIG_SCSI_DEBUG=m @@ -1171,6 +1177,11 @@ CONFIG_SCSI_DEBUG=m CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m # # Serial ATA (prod) and Parallel ATA (experimental) drivers @@ -1249,10 +1260,6 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_HP_SW=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_ALUA=m CONFIG_DM_NL_EVT=y CONFIG_FUSION=y CONFIG_FUSION_SPI=m @@ -1262,7 +1269,7 @@ CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_MAX_FC_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # IEEE 1394 (FireWire) support @@ -1381,6 +1388,7 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m CONFIG_FORCEDETH=m +CONFIG_FORCEDETH_NEW=m CONFIG_DGRS=m CONFIG_EEPRO100=m CONFIG_E100=m @@ -1410,12 +1418,13 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000E=m CONFIG_IGB=m CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set +CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m @@ -1431,15 +1440,22 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m -# CONFIG_IXGBE_NAPI is not set +CONFIG_IXGBE_NAPI=y CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_QLGE=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BNA=m CONFIG_MYRI10GE=m +CONFIG_BE2NET=m # # Token Ring devices @@ -1792,8 +1808,8 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=8 # CONFIG_SERIAL_8250_EXTENDED is not set # @@ -2718,7 +2734,14 @@ CONFIG_MMC_TIFM_SD=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_INFINIBAND_SRP=m # # DMA Engine support @@ -2892,8 +2915,10 @@ CONFIG_SMB_NLS_REMOTE="cp850" CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y @@ -2906,8 +2931,7 @@ CONFIG_NCPFS_NLS=y CONFIG_NCPFS_EXTRAS=y CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set -CONFIG_AFS_FS=m -CONFIG_RXRPC=m +# CONFIG_AFS_FS is not set CONFIG_9P_FS=m CONFIG_GENERIC_ACL=y @@ -3012,7 +3036,8 @@ CONFIG_RCU_TORTURE_TEST=m # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config index ec9a18c..b352f8d 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-sles10-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.60 -# Wed May 21 20:29:32 2008 +# Wed Aug 25 00:08:21 2010 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -22,17 +22,17 @@ CONFIG_AUDIT_ARCH=y # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +CONFIG_LOCALVERSION="-smp" +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SUSE_KERNEL=y CONFIG_SLE_VERSION=10 -CONFIG_SLE_SP=2 +CONFIG_SLE_SP=3 CONFIG_SLE_SP_SUBLEVEL=0 CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -42,11 +42,13 @@ CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_CPUSETS=y CONFIG_RELAY=y CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y @@ -83,6 +85,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y # # Block layer @@ -98,10 +101,10 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="deadline" # # Processor type and features @@ -119,23 +122,38 @@ CONFIG_X86_GOOD_APIC=y CONFIG_MICROCODE=m CONFIG_X86_MSR=m CONFIG_X86_CPUID=m +CONFIG_X86_HT=y CONFIG_X86_IO_APIC=y CONFIG_X86_LOCAL_APIC=y CONFIG_MTRR=y -# CONFIG_SMP is not set +CONFIG_SMP=y +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set +# CONFIG_PREEMPT_BKL is not set +CONFIG_NUMA=y +CONFIG_K8_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NUMA_EMU=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y +CONFIG_DISCONTIGMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=0 +CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y +CONFIG_NR_CPUS=128 +CONFIG_HOTPLUG_CPU=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y @@ -157,6 +175,7 @@ CONFIG_HZ=250 CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_ISA_DMA_API=y +CONFIG_GENERIC_PENDING_IRQ=y # # Power management options @@ -166,6 +185,7 @@ CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set CONFIG_SOFTWARE_SUSPEND=y CONFIG_PM_STD_PARTITION="" +CONFIG_SUSPEND_SMP=y # # ACPI (Advanced Configuration and Power Interface) Support @@ -182,7 +202,9 @@ CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=m CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_NUMA=y CONFIG_ACPI_ASUS=m CONFIG_ACPI_IBM=m CONFIG_ACPI_TOSHIBA=m @@ -708,7 +730,6 @@ CONFIG_ACT200L_DONGLE=m # # Old SIR device drivers # -# CONFIG_IRPORT_SIR is not set # # Old Serial dongle support @@ -1076,17 +1097,17 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -# CONFIG_SCSI_ISCSI_ATTRS is not set +CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m -# CONFIG_SCSI_SAS_ATA is not set +CONFIG_SCSI_SAS_ATA=y # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set CONFIG_ISCSI_TARGET=m # # SCSI low-level drivers # -# CONFIG_ISCSI_TCP is not set +CONFIG_ISCSI_TCP=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1106,13 +1127,16 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000 CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_SCSI_AIC94XX=m -CONFIG_AIC94XX_DEBUG=y +# CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_ARCMSR=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set @@ -1140,8 +1164,9 @@ CONFIG_SCSI_QLOGIC_FC=m CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -# CONFIG_SCSI_QLA_ISCSI is not set +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m +CONFIG_SCSI_BFA_FC=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m CONFIG_SCSI_DEBUG=m @@ -1152,6 +1177,11 @@ CONFIG_SCSI_DEBUG=m CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m +CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m # # Serial ATA (prod) and Parallel ATA (experimental) drivers @@ -1230,10 +1260,6 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m -CONFIG_DM_MULTIPATH_EMC=m -CONFIG_DM_MULTIPATH_HP_SW=m -CONFIG_DM_MULTIPATH_RDAC=m -CONFIG_DM_MULTIPATH_ALUA=m CONFIG_DM_NL_EVT=y CONFIG_FUSION=y CONFIG_FUSION_SPI=m @@ -1243,7 +1269,7 @@ CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_MAX_FC_SGE=256 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m -# CONFIG_FUSION_LOGGING is not set +CONFIG_FUSION_LOGGING=y # # IEEE 1394 (FireWire) support @@ -1353,7 +1379,6 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m CONFIG_ULI526X=m CONFIG_PCMCIA_XIRCOM=m -# CONFIG_PCMCIA_XIRTULIP is not set CONFIG_HP100=m CONFIG_NET_PCI=y CONFIG_PCNET32=m @@ -1363,6 +1388,7 @@ CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m CONFIG_FORCEDETH=m +CONFIG_FORCEDETH_NEW=m CONFIG_DGRS=m CONFIG_EEPRO100=m CONFIG_E100=m @@ -1392,12 +1418,13 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_E1000E=m CONFIG_IGB=m CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m -# CONFIG_R8169_NAPI is not set +CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m @@ -1413,15 +1440,22 @@ CONFIG_QLA3XXX=m # Ethernet (10000 Mbit) # CONFIG_CHELSIO_T1=m -# CONFIG_CHELSIO_T3 is not set +CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m -# CONFIG_IXGBE_NAPI is not set +CONFIG_IXGBE_NAPI=y CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +CONFIG_QLGE=m +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_BNA=m CONFIG_MYRI10GE=m +CONFIG_BE2NET=m # # Token Ring devices @@ -1553,7 +1587,6 @@ CONFIG_ISDN_X25=y # # ISDN feature submodules # -# CONFIG_ISDN_DRV_LOOP is not set CONFIG_ISDN_DIVERSION=m # @@ -1620,7 +1653,6 @@ CONFIG_HISAX_HDLC=y # # Active cards # -# CONFIG_HYSDN is not set # # CAPI subsystem @@ -1763,13 +1795,10 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m -# CONFIG_RISCOM8 is not set CONFIG_SPECIALIX=m # CONFIG_SPECIALIX_RTSCTS is not set CONFIG_SX=m CONFIG_STALDRV=y -# CONFIG_STALLION is not set -# CONFIG_ISTALLION is not set CONFIG_NOZOMI=m # @@ -1779,8 +1808,8 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=8 # CONFIG_SERIAL_8250_EXTENDED is not set # @@ -1860,7 +1889,6 @@ CONFIG_APPLICOM=m # # Ftape, the floppy tape device driver # -# CONFIG_FTAPE is not set CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=m @@ -2706,7 +2734,14 @@ CONFIG_MMC_TIFM_SD=m # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +CONFIG_INFINIBAND_SRP=m # # DMA Engine support @@ -2880,8 +2915,10 @@ CONFIG_SMB_NLS_REMOTE="cp850" CONFIG_CIFS=m CONFIG_CIFS_STATS=y CONFIG_CIFS_STATS2=y +CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y +CONFIG_CIFS_DFS_UPCALL=y # CONFIG_CIFS_EXPERIMENTAL is not set CONFIG_NCP_FS=m CONFIG_NCPFS_PACKET_SIGNING=y @@ -2894,8 +2931,7 @@ CONFIG_NCPFS_NLS=y CONFIG_NCPFS_EXTRAS=y CONFIG_CODA_FS=m # CONFIG_CODA_FS_OLD_API is not set -CONFIG_AFS_FS=m -CONFIG_RXRPC=m +# CONFIG_AFS_FS is not set CONFIG_9P_FS=m CONFIG_GENERIC_ACL=y @@ -3000,7 +3036,8 @@ CONFIG_RCU_TORTURE_TEST=m # # Security options # -# CONFIG_KEYS is not set +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set @@ -3014,11 +3051,11 @@ CONFIG_SECURITY_APPARMOR=m # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ABLKCIPHER=m CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_HASH=m -CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_NULL=m diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in index 16fa736..b179eeb 100644 --- a/lustre/kernel_patches/targets/2.6-sles10.target.in +++ b/lustre/kernel_patches/targets/2.6-sles10.target.in @@ -1,6 +1,6 @@ lnxmaj="2.6.16" lnxmin=".60" -lnxrel="0.42.8" +lnxrel="0.69.1" # use this when there is an "RPM fix" which means that the name of the # (source) RPM has been updated but the version of the kernel inside the # RPM is not also updated diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c index 0643e0e..c963882 100644 --- a/lustre/lvfs/fsfilt_ext3.c +++ b/lustre/lvfs/fsfilt_ext3.c @@ -2059,7 +2059,11 @@ static int fsfilt_ext3_quotacheck(struct super_block *sb, /* number of inodes that have been allocated */ inode_inuse = sbi->s_inodes_per_group * sbi->s_groups_count - +#ifdef EXT3_SBI_WITH_COUNTER64 + percpu_counter64_sum(&sbi->s_freeinodes_counter); +#else percpu_counter_sum(&sbi->s_freeinodes_counter); +#endif /* check quota and update in hash */ for (group = 0; group < sbi->s_groups_count && inode_inuse > 0; -- 1.8.3.1