From: yangsheng Date: Sun, 12 Sep 2010 06:49:28 +0000 (+0400) Subject: b=22514 kernel update for rhel5.5 & oel5.5. X-Git-Tag: 2.0.52.0~3 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=898d16e4a9265be32af41bea56f96ddf6e83877d b=22514 kernel update for rhel5.5 & oel5.5. i=johann i=girish,rahul i=kalpak,zhanghongchao i=brian,wangyb --- diff --git a/ldiskfs/kernel_patches/patches/export-ext4-2.6-rhel5.patch b/ldiskfs/kernel_patches/patches/export-ext4-2.6-rhel5.patch index c395e00..a89a0aa 100644 --- a/ldiskfs/kernel_patches/patches/export-ext4-2.6-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/export-ext4-2.6-rhel5.patch @@ -38,9 +38,9 @@ Index: linux-stage/fs/ext4/ext4.h --- linux-stage.orig/fs/ext4/ext4.h +++ linux-stage/fs/ext4/ext4.h @@ -1024,6 +1024,8 @@ extern unsigned long ext4_count_free_ino - extern unsigned long ext4_count_free_inodes(struct super_block *); - extern unsigned long ext4_count_dirs(struct super_block *); - extern void ext4_check_inodes_bitmap(struct super_block *); + ext4_group_t group, + struct ext4_group_desc *desc); + extern void mark_bitmap_end(int start_bit, int end_bit, char *bitmap); +extern struct buffer_head *ext4_read_inode_bitmap(struct super_block *sb, + ext4_group_t block_group); diff --git a/ldiskfs/kernel_patches/patches/ext4-back-dquot-to-rhel54.patch b/ldiskfs/kernel_patches/patches/ext4-back-dquot-to-rhel54.patch new file mode 100644 index 0000000..c3b0ef8 --- /dev/null +++ b/ldiskfs/kernel_patches/patches/ext4-back-dquot-to-rhel54.patch @@ -0,0 +1,53 @@ +diff -up a/fs/ext4/super.c b/s/ext4/super.c +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -706,9 +767,47 @@ static inline struct inode *dquot_to_ino + static ssize_t ext4_quota_write(struct super_block *sb, int type, + const char *data, size_t len, loff_t off); + ++static int ext4_dquot_initialize(struct inode *inode, int type) ++{ ++ handle_t *handle; ++ int ret, err; ++ ++ /* We may create quota structure so we need to reserve enough blocks */ ++ handle = ext4_journal_start(inode, 2*EXT4_QUOTA_INIT_BLOCKS(inode->i_sb)); ++ if (IS_ERR(handle)) ++ return PTR_ERR(handle); ++ ret = dquot_initialize(inode, type); ++ err = ext4_journal_stop(handle); ++ if (!ret) ++ ret = err; ++ return ret; ++} ++ ++static int ext4_dquot_drop(struct inode *inode) ++{ ++ handle_t *handle; ++ int ret, err; ++ ++ /* We may delete quota structure so we need to reserve enough blocks */ ++ handle = ext4_journal_start(inode, 2*EXT4_QUOTA_DEL_BLOCKS(inode->i_sb)); ++ if (IS_ERR(handle)) { ++ /* ++ * We call dquot_drop() anyway to at least release references ++ * to quota structures so that umount does not hang. ++ */ ++ dquot_drop(inode); ++ return PTR_ERR(handle); ++ } ++ ret = dquot_drop(inode); ++ err = ext4_journal_stop(handle); ++ if (!ret) ++ ret = err; ++ return ret; ++} ++ + static struct dquot_operations ext4_quota_operations = { +- .initialize = dquot_initialize, +- .drop = dquot_drop, ++ .initialize = ext4_dquot_initialize, ++ .drop = ext4_dquot_drop, + .alloc_space = dquot_alloc_space, + .alloc_inode = dquot_alloc_inode, + .free_space = dquot_free_space, diff --git a/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch index 8bbb947..912b52c 100644 --- a/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-disable-delalloc-rhel5.patch @@ -4,7 +4,7 @@ Disable the DELALLOC feature because it is not robust in ext4 versions < 2.6.31. diff -rupN linux-2.6.18-164.6.1_1/fs/ext4/super.c linux-2.6.18-164.6.1_2/fs/ext4/super.c --- linux-2.6.18-164.6.1_1/fs/ext4/super.c 2010-08-05 13:44:07.000000000 +0530 +++ linux-2.6.18-164.6.1_2/fs/ext4/super.c 2010-08-05 13:46:29.000000000 +0530 -@@ -2091,13 +2091,6 @@ static int ext4_fill_super(struct super_ +@@ -2091,12 +2091,6 @@ static int ext4_fill_super(struct super_ set_opt(sbi->s_mount_opt, BARRIER); @@ -14,7 +14,6 @@ diff -rupN linux-2.6.18-164.6.1_1/fs/ext4/super.c linux-2.6.18-164.6.1_2/fs/ext4 - */ - set_opt(sbi->s_mount_opt, DELALLOC); - -- - if (!parse_options((char *) data, sb, &journal_devnum, + if (!parse_options((char *) data, sb, &journal_devnum, &journal_ioprio, NULL, 0)) goto failed_mount; diff --git a/ldiskfs/kernel_patches/patches/ext4-disable-mb-cache-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-disable-mb-cache-rhel5.patch index 9229cd2..e04b125 100644 --- a/ldiskfs/kernel_patches/patches/ext4-disable-mb-cache-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-disable-mb-cache-rhel5.patch @@ -113,17 +113,17 @@ Index: linux-stage/fs/ext4/super.c --- linux-stage.orig/fs/ext4/super.c +++ linux-stage/fs/ext4/super.c @@ -1481,6 +1481,7 @@ enum { + Opt_iopen, Opt_noiopen, Opt_iopen_nopriv, Opt_bigendian_extents, Opt_force_over_16tb, - Opt_extents, Opt_noextents, + Opt_no_mbcache, }; static match_table_t tokens = { @@ -1554,6 +1555,7 @@ static match_table_t tokens = { + {Opt_noauto_da_alloc, "noauto_da_alloc"}, + {Opt_bigendian_extents, "bigendian_extents"}, {Opt_force_over_16tb, "force_over_16tb"}, - {Opt_extents, "extents"}, - {Opt_noextents, "noextents"}, + {Opt_no_mbcache, "no_mbcache"}, {Opt_err, NULL}, }; diff --git a/ldiskfs/kernel_patches/patches/ext4-dynlocks-2.6-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-dynlocks-2.6-rhel5.patch index 2a11baa..d39b4f9 100644 --- a/ldiskfs/kernel_patches/patches/ext4-dynlocks-2.6-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-dynlocks-2.6-rhel5.patch @@ -1,15 +1,16 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/Makefile linux-2.6.27.21-0.1_2//fs/ext4/Makefile --- linux-2.6.27.21-0.1_1//fs/ext4/Makefile 2009-08-21 15:12:51.000000000 +0530 +++ linux-2.6.27.21-0.1_2//fs/ext4/Makefile 2009-08-21 15:13:23.000000000 +0530 -@@ -6,7 +6,7 @@ obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o +@@ -6,7 +6,8 @@ obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o - ext4dev-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \ - ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \ -- ext4_jbd2.o migrate.o mballoc.o -+ ext4_jbd2.o migrate.o mballoc.o dynlocks.o - - ext4dev-$(CONFIG_EXT4DEV_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o - ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL) += acl.o + ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \ + ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \ +- ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o ++ ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o \ ++ dynlocks.o + + ext4-$(CONFIG_EXT4_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o + ext4-$(CONFIG_EXT4_FS_POSIX_ACL) += acl.o diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/super.c linux-2.6.27.21-0.1_2//fs/ext4/super.c --- linux-2.6.27.21-0.1_1//fs/ext4/super.c 2009-08-21 15:12:51.000000000 +0530 +++ linux-2.6.27.21-0.1_2//fs/ext4/super.c 2009-08-21 15:18:18.000000000 +0530 diff --git a/ldiskfs/kernel_patches/patches/ext4-ext_generation-sles11.patch b/ldiskfs/kernel_patches/patches/ext4-ext_generation-sles11.patch index 6d51ad3..490d92e 100644 --- a/ldiskfs/kernel_patches/patches/ext4-ext_generation-sles11.patch +++ b/ldiskfs/kernel_patches/patches/ext4-ext_generation-sles11.patch @@ -14,10 +14,10 @@ Index: linux-2.6.27.21-0.1/fs/ext4/ext4_extents.h static inline void ext4_ext_invalidate_cache(struct inode *inode) { -Index: linux-2.6.27.21-0.1/fs/ext4/ext4_i.h +Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h =================================================================== ---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_i.h 2009-07-07 14:47:13.000000000 +0530 -+++ linux-2.6.27.21-0.1/fs/ext4/ext4_i.h 2009-07-07 14:50:07.000000000 +0530 +--- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h 2009-07-07 14:47:13.000000000 +0530 ++++ linux-2.6.27.21-0.1/fs/ext4/ext4.h 2009-07-07 14:50:07.000000000 +0530 @@ -114,6 +114,7 @@ struct inode vfs_inode; struct jbd2_inode jinode; diff --git a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch index cb0bcf0..91aee70 100644 --- a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel5.patch @@ -30,9 +30,9 @@ diff -up linux-2.6.18-164/fs/ext4/extents.c linux-2.6.18-164/fs/ext4/extents.c - if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) { + if (test_opt(sb, EXTENTS)) { + #if defined(AGGRESSIVE_TEST) || defined(CHECK_BINSEARCH) || defined(EXTENTS_STATS) printk(KERN_INFO "EXT4-fs: file extents enabled"); #ifdef AGGRESSIVE_TEST - printk(", aggressive tests"); @@ -2338,7 +2338,7 @@ void ext4_ext_init(struct super_block *s */ void ext4_ext_release(struct super_block *sb) diff --git a/ldiskfs/kernel_patches/patches/ext4-fiemap-2.6-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-fiemap-2.6-rhel5.patch index ade2692..47269d8 100644 --- a/ldiskfs/kernel_patches/patches/ext4-fiemap-2.6-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-fiemap-2.6-rhel5.patch @@ -6,9 +6,9 @@ diff -rupN linux-2.6.18-164.6.1_1/fs/ext4/ext4.h linux-2.6.18-164.6.1_2/fs/ext4/ #define EXT4_IOC_GROUP_ADD _IOW('f', 8, struct ext4_new_group_input) #define EXT4_IOC_MIGRATE _IO('f', 9) +#define EXT4_IOC_FIEMAP _IOWR('f', 11, struct fiemap) + /* note ioctl 10 reserved for an early version of the FIEMAP ioctl */ /* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */ - /* diff -rupN linux-2.6.18-164.6.1_1/fs/ext4/ioctl.c linux-2.6.18-164.6.1_2/fs/ext4/ioctl.c --- linux-2.6.18-164.6.1_1/fs/ext4/ioctl.c 2009-12-22 13:06:51.000000000 +0530 +++ linux-2.6.18-164.6.1_2/fs/ext4/ioctl.c 2009-12-22 13:09:45.000000000 +0530 diff --git a/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch index 206e159..42b5ce7 100644 --- a/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-inode-version-rhel5.patch @@ -37,10 +37,10 @@ Index: linux-2.6.18-128.1.6/fs/ext4/inode.c raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize); } -Index: linux-2.6.18-128.1.6/fs/ext4/ext4_i.h +Index: linux-2.6.18-128.1.6/fs/ext4/ext4.h =================================================================== ---- linux-2.6.18-128.1.6.orig/fs/ext4/ext4_i.h -+++ linux-2.6.18-128.1.6/fs/ext4/ext4_i.h +--- linux-2.6.18-128.1.6.orig/fs/ext4/ext4.h ++++ linux-2.6.18-128.1.6/fs/ext4/ext4.h @@ -21,6 +21,8 @@ #include #include @@ -51,22 +51,22 @@ Index: linux-2.6.18-128.1.6/fs/ext4/ext4_i.h typedef int ext4_grpblk_t; @@ -164,6 +166,8 @@ struct ext4_inode_info { - spinlock_t i_prealloc_lock; - - void *i_filterdata; + struct list_head i_aio_dio_complete_list; + /* current io_end structure for async DIO write*/ + ext4_io_end_t *cur_aio_dio; + + __u64 i_fs_version; }; - #endif /* _EXT4_I */ + /* Index: linux-2.6.18-128.1.6/fs/ext4/ialloc.c =================================================================== --- linux-2.6.18-128.1.6.orig/fs/ext4/ialloc.c +++ linux-2.6.18-128.1.6/fs/ext4/ialloc.c @@ -878,6 +878,7 @@ got: - ei->i_dtime = 0; ei->i_block_alloc_info = NULL; ei->i_block_group = group; + ei->i_last_alloc_group = ~0; + ei->i_fs_version = 0; ext4_set_inode_flags(inode); diff --git a/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch b/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch index 4591d3c..ea83828 100644 --- a/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch +++ b/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch @@ -170,14 +170,14 @@ Index: b/fs/ext4/namei.c root = (struct dx_root *) bh->b_data; + dot_de = (struct ext4_dir_entry_2 *) bh->b_data; -+ dotdot_de = ext4_next_entry(dot_de); ++ dotdot_de = ext4_next_entry(dot_de, blocksize); + /* The 0th block becomes the root, move the dirents out */ - fde = &root->dotdot; - de = (struct ext4_dir_entry_2 *)((char *)fde + -- ext4_rec_len_from_disk(fde->rec_len)); +- ext4_rec_len_from_disk(fde->rec_len, blocksize)); + de = (struct ext4_dir_entry_2 *)((char *)dotdot_de + -+ ext4_rec_len_from_disk(dotdot_de->rec_len)); ++ ext4_rec_len_from_disk(dotdot_de->rec_len, blocksize)); - if ((char *) de >= (((char *) root) + blocksize)) { + if ((char *) de >= (((char *) dot_de) + blocksize)) { ext4_error(dir->i_sb, __func__, @@ -191,12 +191,13 @@ Index: b/fs/ext4/namei.c /* Allocate new block for the 0th block's dirents */ bh2 = ext4_append(handle, dir, &block, &retval); -@@ -1472,18 +1475,23 @@ static int make_indexed_dir(handle_t *ha - de = de2; +@@ -1472,19 +1475,23 @@ static int make_indexed_dir(handle_t *ha de->rec_len = ext4_rec_len_to_disk(data1 + blocksize - (char *) de); + blocksize); /* Initialize the root; the dot dirents already exist */ - de = (struct ext4_dir_entry_2 *) (&root->dotdot); -- de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2)); +- de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2), +- blocksize); - memset (&root->info, 0, sizeof(root->info)); - root->info.info_length = sizeof(root->info); - root->info.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version; @@ -205,7 +206,7 @@ Index: b/fs/ext4/namei.c - dx_set_count(entries, 1); - dx_set_limit(entries, dx_root_limit(dir, sizeof(root->info))); + dotdot_de->rec_len = ext4_rec_len_to_disk(blocksize - -+ le16_to_cpu(dot_de->rec_len)); ++ le16_to_cpu(dot_de->rec_len), blocksize); + + /* initialize hashing info */ + dx_info = dx_get_dx_info(dot_de); diff --git a/ldiskfs/kernel_patches/patches/ext4-map_inode_page-2.6.18-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-map_inode_page-2.6.18-rhel5.patch index 4ed87f0..1bd0674 100644 --- a/ldiskfs/kernel_patches/patches/ext4-map_inode_page-2.6.18-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-map_inode_page-2.6.18-rhel5.patch @@ -2,7 +2,7 @@ Index: linux-2.6.18.i386/fs/ext4/inode.c =================================================================== --- linux-2.6.18.i386.orig/fs/ext4/inode.c +++ linux-2.6.18.i386/fs/ext4/inode.c -@@ -3666,3 +3666,66 @@ out_unlock: +@@ -3666,3 +3666,67 @@ out_unlock: unlock_page(page); return ret; } @@ -44,7 +44,8 @@ Index: linux-2.6.18.i386/fs/ext4/inode.c + if (blocks[i] != 0) + continue; + -+ rc = ext4_get_blocks_handle(handle, inode, iblock, 1, &dummy, 1, 1); ++ rc = ext4_ind_get_blocks(handle, inode, iblock, 1, &dummy, ++ EXT4_GET_BLOCKS_CREATE); + if (rc < 0) { + printk(KERN_INFO "ext4_map_inode_page: error reading " + "block %ld\n", iblock); diff --git a/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch index bbf2ba8..7c3933c 100644 --- a/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch @@ -1,7 +1,7 @@ diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ialloc.c linux-2.6.18-164.6.1_2//fs/ext4/ialloc.c --- linux-2.6.18-164.6.1_1//fs/ext4/ialloc.c 2010-03-31 17:42:50.000000000 +0530 +++ linux-2.6.18-164.6.1_2//fs/ext4/ialloc.c 2010-03-31 17:43:22.000000000 +0530 -@@ -710,12 +710,15 @@ struct inode *ext4_new_inode_goal(handle +@@ -622,11 +622,14 @@ struct inode *ext4_new_inode_goal(handle sb = dir->i_sb; trace_mark(ext4_request_inode, "dev %s dir %lu mode %d", sb->s_id, dir->i_ino, mode); @@ -13,110 +13,32 @@ diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ialloc.c linux-2.6.18-164.6.1_2//fs/e if (!inode) return ERR_PTR(-ENOMEM); ei = EXT4_I(inode); - - sbi = EXT4_SB(sb); - es = sbi->s_es; - if (goal && goal <= le32_to_cpu(es->s_inodes_count)) { + if (goal) + goal = sbi->s_inode_goal; diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/super.c linux-2.6.18-164.6.1_2//fs/ext4/super.c --- linux-2.6.18-164.6.1_1//fs/ext4/super.c 2010-03-31 17:42:50.000000000 +0530 +++ linux-2.6.18-164.6.1_2//fs/ext4/super.c 2010-03-31 17:45:32.000000000 +0530 @@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include "ext4.h" - #include "ext4_jbd2.h" -@@ -581,6 +582,7 @@ static void ext4_put_super(struct super_ - ext4_commit_super(sb, es, 1); - } - if (sbi->s_proc) { -+ remove_proc_entry(EXT4_MAX_DIR_SIZE_NAME, sbi->s_proc); - remove_proc_entry("inode_readahead_blks", sbi->s_proc); - remove_proc_entry("inode_goal", sbi->s_proc); - remove_proc_entry(sb->s_id, ext4_proc_root); -@@ -2341,6 +2343,48 @@ static unsigned long ext4_get_stripe_siz - return 0; - } + EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs); + EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request); + EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc); ++EXT4_RW_ATTR_SBI_UI(max_dir_size, s_max_dir_size); + + static struct attribute *ext4_attrs[] = { + ATTR_LIST(delayed_allocation_blocks), +@@ -48,6 +48,7 @@ + ATTR_LIST(mb_order2_req), + ATTR_LIST(mb_stream_req), + ATTR_LIST(mb_group_prealloc), ++ ATTR_LIST(max_dir_size), + NULL, + }; -+#ifdef CONFIG_PROC_FS -+static int ext4_max_dir_size_read(char *page, char **start, off_t off, -+ int count, int *eof, void *data) -+{ -+ struct ext4_sb_info *sbi = data; -+ int len; -+ -+ *eof = 1; -+ if (off != 0) -+ return 0; -+ -+ len = sprintf(page, "%lu\n", sbi->s_max_dir_size); -+ *start = page; -+ return len; -+} -+ -+static int ext4_max_dir_size_write(struct file *file, const char *buffer, -+ unsigned long count, void *data) -+{ -+ struct ext4_sb_info *sbi = data; -+ char str[32]; -+ unsigned long value; -+ char *end; -+ -+ if (count >= sizeof(str)) { -+ printk(KERN_ERR "EXT4-fs: %s string too long, max %u bytes\n", -+ EXT4_MAX_DIR_SIZE_NAME, (int)sizeof(str)); -+ return -EOVERFLOW; -+ } -+ -+ if (copy_from_user(str, buffer, count)) -+ return -EFAULT; -+ -+ value = simple_strtol(str, &end, 0); -+ if (value < 0) -+ return -ERANGE; -+ -+ sbi->s_max_dir_size = value; -+ return count; -+} -+#endif -+ - static int ext4_fill_super(struct super_block *sb, void *data, int silent) - __releases(kernel_lock) - __acquires(kernel_lock) -@@ -2690,6 +2734,19 @@ static int ext4_fill_super(struct super_ - p->proc_fops = &ext4_ui_proc_fops, - p->data = &sbi->s_inode_goal; - } -+ sbi->s_max_dir_size = EXT4_DEFAULT_MAX_DIR_SIZE; -+ p = create_proc_entry(EXT4_MAX_DIR_SIZE_NAME, -+ S_IFREG | S_IRUGO | S_IWUSR, sbi->s_proc); -+ if (p == NULL) { -+ printk(KERN_ERR "EXT4-fs: unable to create %s\n", -+ EXT4_MAX_DIR_SIZE_NAME); -+ ret = -ENOMEM; -+ goto failed_mount; -+ } -+ p->data = sbi; -+ p->read_proc = ext4_max_dir_size_read; -+ p->write_proc = ext4_max_dir_size_write; -+ - } - #endif - -@@ -2976,6 +3033,7 @@ failed_mount2: - kfree(sbi->s_group_desc); - failed_mount: - if (sbi->s_proc) { -+ remove_proc_entry(EXT4_MAX_DIR_SIZE_NAME, sbi->s_proc); - remove_proc_entry("inode_readahead_blks", sbi->s_proc); - remove_proc_entry("inode_goal", sbi->s_proc); - remove_proc_entry(sb->s_id, ext4_proc_root); diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ext4_sb.h linux-2.6.18-164.6.1_2//fs/ext4/ext4_sb.h ---- linux-2.6.18-164.6.1_1//fs/ext4/ext4_sb.h 2010-03-31 17:42:50.000000000 +0530 -+++ linux-2.6.18-164.6.1_2//fs/ext4/ext4_sb.h 2010-03-31 17:43:22.000000000 +0530 +--- linux-2.6.18-164.6.1_1//fs/ext4/ext4.h 2010-03-31 17:42:50.000000000 +0530 ++++ linux-2.6.18-164.6.1_2//fs/ext4/ext4.h 2010-03-31 17:43:22.000000000 +0530 @@ -119,6 +119,7 @@ struct ext4_sb_info { /* where last allocation was done - for stream allocation */ unsigned long s_mb_last_group; @@ -125,20 +47,3 @@ diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ext4_sb.h linux-2.6.18-164.6.1_2//fs/ /* history to debug policy */ struct ext4_mb_history *s_mb_history; -diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ext4.h linux-2.6.18-164.6.1_2//fs/ext4/ext4.h ---- linux-2.6.18-164.6.1_1//fs/ext4/ext4.h 2010-03-31 17:42:50.000000000 +0530 -+++ linux-2.6.18-164.6.1_2//fs/ext4/ext4.h 2010-03-31 17:43:22.000000000 +0530 -@@ -1029,6 +1029,12 @@ struct mmp_struct { - #define EXT4_MMP_MIN_CHECK_INTERVAL 5 - - /* -+ * max directory size tunable -+ */ -+#define EXT4_DEFAULT_MAX_DIR_SIZE 0 -+#define EXT4_MAX_DIR_SIZE_NAME "max_dir_size" -+ -+/* - * Function prototypes - */ - - diff --git a/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch index 9e19012..a11198a 100644 --- a/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-mballoc-extra-checks-rhel5.patch @@ -13,11 +13,11 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ ext4_group_t group); @@ -660,7 +660,7 @@ static void ext4_mb_mark_free_simple(str - } } --static void ext4_mb_generate_buddy(struct super_block *sb, -+static int ext4_mb_generate_buddy(struct super_block *sb, + static noinline_for_stack +-void ext4_mb_generate_buddy(struct super_block *sb, ++int ext4_mb_generate_buddy(struct super_block *sb, void *buddy, void *bitmap, ext4_group_t group) { struct ext4_group_info *grp = ext4_get_group_info(sb, group); @@ -155,7 +155,7 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ if (ac->ac_op == EXT4_MB_HISTORY_ALLOC) { if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start && ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group) -@@ -3539,22 +3555,67 @@ ext4_mb_use_preallocated(struct ext4_all +@@ -3539,23 +3555,68 @@ ext4_mb_use_preallocated(struct ext4_all } /* @@ -194,10 +194,11 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ +/* * the function goes through all preallocation in this group and marks them * used in in-core bitmap. buddy must be generated from this bitmap - * Need to be called with ext4 group lock (ext4_lock_group) + * Need to be called with ext4 group lock held */ --static void ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap, -+static int ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap, + static noinline_for_stack +-void ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap, ++int ext4_mb_generate_from_pa(struct super_block *sb, void *bitmap, ext4_group_t group) { struct ext4_group_info *grp = ext4_get_group_info(sb, group); @@ -224,7 +225,7 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ /* all form of preallocation discards first load group, * so the only competing code is preallocation use. * we don't need any locking here -@@ -3570,15 +3631,24 @@ static void ext4_mb_generate_from_pa(str +@@ -3570,14 +3631,23 @@ static void ext4_mb_generate_from_pa(str &groupnr, &start); len = pa->pa_len; spin_unlock(&pa->pa_lock); @@ -234,8 +235,7 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ continue; + } BUG_ON(groupnr != group); - mb_set_bits(sb_bgl_lock(EXT4_SB(sb), group), - bitmap, start, len); + mb_set_bits(bitmap, start, len); preallocated += len; count++; } @@ -245,7 +245,7 @@ diff -rupN linux-2.6.18-128.1.6_1//fs/ext4/mballoc.c linux-2.6.18-128.1.6_2//fs/ + count, grp->bb_prealloc_nr, skip); + return -EIO; + } - mb_debug("prellocated %u for group %u\n", preallocated, group); + mb_debug(1, "prellocated %u for group %u\n", preallocated, group); + return 0; } diff --git a/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch b/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch index cc8682a..0ca58dd 100644 --- a/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch +++ b/ldiskfs/kernel_patches/patches/ext4-mballoc-pa_free-mismatch.patch @@ -5,7 +5,7 @@ Index: linux-stage/fs/ext4/mballoc.c @@ -3892,6 +3892,7 @@ INIT_LIST_HEAD(&pa->pa_group_list); pa->pa_deleted = 0; - pa->pa_linear = 0; + pa->pa_type = MB_INODE_PA; + pa->pa_error = 0; mb_debug("new inode pa %p: %llu/%u for %u\n", pa, @@ -13,18 +13,17 @@ Index: linux-stage/fs/ext4/mballoc.c @@ -3956,6 +3957,7 @@ INIT_LIST_HEAD(&pa->pa_group_list); pa->pa_deleted = 0; - pa->pa_linear = 1; + pa->pa_type = MB_GROUP_PA; + pa->pa_error = 0; mb_debug("new group pa %p: %llu/%u for %u\n", pa, pa->pa_pstart, pa->pa_len, pa->pa_lstart); -@@ -4019,7 +4021,10 @@ +@@ -4019,7 +4021,9 @@ int err = 0; int free = 0; -+ BUG_ON(!ext4_is_group_locked(sb, e4b->bd_group)); ++ assert_spin_locked(ext4_group_lock_ptr(sb, e4b->bd_group)); BUG_ON(pa->pa_deleted == 0); -+ BUG_ON(pa->pa_linear != 0); + BUG_ON(pa->pa_inode == NULL); ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit); grp_blk_start = pa->pa_pstart - bit; @@ -122,10 +121,10 @@ Index: linux-stage/fs/ext4/mballoc.c + printk(KERN_WARNING "Release to readonly device %s (%#x): " + "[inode %lu] [block %lu] [count %lu] [is_meta %d]\n", + bdev->bd_disk ? bdev->bd_disk->disk_name : "", -+ bdev->bd_dev, inode->i_ino, block, count, metadata); ++ bdev->bd_dev, inode->i_ino, (unsigned long)block, count, metadata); + } + - ext4_debug("freeing block %lu\n", block); + ext4_debug("freeing block %llu\n", block); trace_mark(ext4_free_blocks, "dev %s block %llu count %lu metadata %d ino %lu", Index: linux-stage/fs/ext4/mballoc.h @@ -141,9 +140,9 @@ Index: linux-stage/fs/ext4/mballoc.h #include "ext4.h" #include "group.h" @@ -134,6 +135,7 @@ - unsigned short pa_free; /* how many blocks are free */ - unsigned short pa_linear; /* consumed in one direction - * strictly, for grp prealloc */ + ext4_grpblk_t pa_len; /* len of preallocated chunk */ + ext4_grpblk_t pa_free; /* how many blocks are free */ + unsigned short pa_type; /* pa type. inode or group */ + unsigned short pa_error; spinlock_t *pa_obj_lock; struct inode *pa_inode; /* hack, for history only */ diff --git a/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch index af54824..b8b55ae 100644 --- a/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch @@ -18,15 +18,6 @@ Index: linux-2.6.18.i386/fs/ext4/extents.c =================================================================== --- linux-2.6.18.i386.orig/fs/ext4/extents.c +++ linux-2.6.18.i386/fs/ext4/extents.c -@@ -50,7 +50,7 @@ - * ext_pblock: - * combine low and high parts of physical block number into ext4_fsblk_t - */ --static ext4_fsblk_t ext_pblock(struct ext4_extent *ex) -+ext4_fsblk_t ext_pblock(struct ext4_extent *ex) - { - ext4_fsblk_t block; - @@ -60,6 +60,17 @@ static ext4_fsblk_t ext_pblock(struct ex } @@ -152,19 +143,16 @@ Index: linux-2.6.18.i386/fs/ext4/ext4_extents.h /* * ext4_inode has i_block array (60 bytes total). -@@ -124,6 +129,7 @@ struct ext4_ext_path { +@@ -124,6 +129,8 @@ struct ext4_ext_path { #define EXT4_EXT_CACHE_GAP 1 #define EXT4_EXT_CACHE_EXTENT 2 +#define EXT4_EXT_HAS_NO_TREE /* ext4_extents_tree struct is not used*/ ++#define EXT_INSERT_EXTENT_WITH_5ARGS #define EXT_MAX_BLOCK 0xffffffff -@@ -228,9 +234,12 @@ static inline int ext4_ext_get_actual_le - } - - extern int ext4_ext_calc_metadata_amount(struct inode *inode, int blocks); -+extern ext4_fsblk_t ext_pblock(struct ext4_extent *ex); +@@ -228,6 +234,8 @@ static inline int ext4_ext_get_actual_le extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *); extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t); extern int ext4_extent_tree_init(handle_t *, struct inode *); @@ -198,26 +186,6 @@ Index: linux-2.6.18.i386/fs/ext4/mballoc.c + +EXPORT_SYMBOL(ext4_free_blocks); + -Index: linux-2.6.18.i386/fs/ext4/super.c -=================================================================== ---- linux-2.6.18.i386.orig/fs/ext4/super.c -+++ linux-2.6.18.i386/fs/ext4/super.c -@@ -91,6 +91,7 @@ ext4_fsblk_t ext4_inode_bitmap(struct su - (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? - (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0); - } -+EXPORT_SYMBOL(ext4_inode_bitmap); - - ext4_fsblk_t ext4_inode_table(struct super_block *sb, - struct ext4_group_desc *bg) -@@ -113,6 +118,7 @@ - (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? - (__u32)le16_to_cpu(bg->bg_itable_unused_hi) << 16 : 0); - } -+EXPORT_SYMBOL(ext4_itable_unused_count); - - void ext4_block_bitmap_set(struct super_block *sb, - struct ext4_group_desc *bg, ext4_fsblk_t blk) Index: linux-2.6.18.i386/fs/ext4/ext4_jbd2.c =================================================================== --- linux-2.6.18.i386.orig/fs/ext4/ext4_jbd2.c @@ -264,31 +232,81 @@ Index: linux-2.6.27.21-0.1/fs/ext4/super.c =================================================================== --- linux-2.6.27.21-0.1.orig/fs/ext4/super.c 2009-07-07 14:47:19.000000000 +0530 +++ linux-2.6.27.21-0.1/fs/ext4/super.c 2009-07-07 14:48:53.000000000 +0530 +@@ -91,6 +91,7 @@ ext4_fsblk_t ext4_inode_bitmap(struct su + (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? + (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0); + } ++EXPORT_SYMBOL(ext4_inode_bitmap); + + ext4_fsblk_t ext4_inode_table(struct super_block *sb, + struct ext4_group_desc *bg) +@@ -113,6 +118,7 @@ + (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? + (__u32)le16_to_cpu(bg->bg_itable_unused_hi) << 16 : 0); + } ++EXPORT_SYMBOL(ext4_itable_unused_count); + + void ext4_block_bitmap_set(struct super_block *sb, + struct ext4_group_desc *bg, ext4_fsblk_t blk) @@ -1286,6 +1287,7 @@ Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, Opt_resize, Opt_usrquota, Opt_grpquota, Opt_i_version, -+ Opt_mballoc, ++ Opt_mballoc, Opt_extents, Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_inode_readahead_blks, Opt_journal_ioprio, Opt_iopen, Opt_noiopen, Opt_iopen_nopriv, Opt_bigendian_extents, -@@ -1346,6 +1348,7 @@ +@@ -1346,6 +1348,8 @@ {Opt_barrier, "barrier"}, {Opt_nobarrier, "nobarrier"}, {Opt_i_version, "i_version"}, + {Opt_mballoc, "mballoc"}, ++ {Opt_extents, "extents"}, {Opt_stripe, "stripe=%u"}, {Opt_resize, "resize"}, {Opt_delalloc, "delalloc"}, -@@ -1768,6 +1771,8 @@ +@@ -1768,6 +1771,9 @@ case Opt_bigendian_extents: bigendian_extents = 1; break; + case Opt_mballoc: ++ case Opt_extents: + break; default: printk(KERN_ERR "EXT4-fs: Unrecognized mount option \"%s\" " +@@ -2768,7 +2771,7 @@ + char *buf) + { + return snprintf(buf, PAGE_SIZE, "%llu\n", +- (s64) percpu_counter_sum(&sbi->s_dirtyblocks_counter)); ++ (unsigned long long) percpu_counter_sum(&sbi->s_dirtyblocks_counter)); + } + + static ssize_t session_write_kbytes_show(struct ext4_attr *a, +@@ -2868,11 +2871,11 @@ + struct super_block *sb = sbi->s_buddy_cache->i_sb; + + return snprintf(buf, PAGE_SIZE, "%llu\n", +- sbi->s_kbytes_written + ++ (unsigned long long)(sbi->s_kbytes_written + + (sb->s_bdev->bd_part ? + (part_stat_read(sb->s_bdev->bd_part, sectors[1]) - + EXT4_SB(sb)->s_sectors_written_start) >> 1 +- : 0)); ++ : 0))); + } + + static ssize_t inode_readahead_blks_store(struct ext4_attr *a, +@@ -3868,7 +3871,7 @@ + if (blocks_count && ext4_blocks_count(es) > blocks_count) { + ext4_msg(sb, KERN_WARNING, "bad geometry: block count %llu " + "exceeds size of device (%llu blocks)", +- ext4_blocks_count(es), blocks_count); ++ ext4_blocks_count(es), (unsigned long long)blocks_count); + goto failed_mount; + } + Index: linux-2.6.27.21-0.1/fs/ext4/fsync.c =================================================================== --- linux-2.6.27.21-0.1.orig/fs/ext4/fsync.c 2009-07-07 14:47:19.000000000 +0530 @@ -302,3 +320,17 @@ Index: linux-2.6.27.21-0.1/fs/ext4/fsync.c /* * data=writeback: +Index: linux-2.6.27.21-0.1/fs/ext4/move_extent.c +=================================================================== +--- linux-2.6.27.21-0.1.orig/fs/ext4/move_extent.c 2009-07-07 14:47:19.000000000 +0530 ++++ linux-2.6.27.21-0.1/fs/ext4/move_extent.c 2009-07-07 14:48:53.000000000 +0530 +@@ -1768,7 +1771,8 @@ + ext4_error(orig_inode->i_sb, __func__, + "We replaced blocks too much! " + "sum of replaced: %llu requested: %llu", +- *moved_len, len); ++ (unsigned long long)(*moved_len), ++ (unsigned long long)(len)); + ret1 = -EIO; + goto out; + } diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch index 201c450..60020b4 100644 --- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch @@ -481,14 +481,14 @@ Index: linux-stage/fs/ext4/ext4.h * Function prototypes */ -Index: linux-stage/fs/ext4/ext4_sb.h +Index: linux-stage/fs/ext4/ext4.h =================================================================== ---- linux-stage.orig/fs/ext4/ext4_sb.h -+++ linux-stage/fs/ext4/ext4_sb.h +--- linux-stage.orig/fs/ext4/ext4.h ++++ linux-stage/fs/ext4/ext4.h @@ -149,6 +149,8 @@ struct ext4_sb_info { - - unsigned int s_log_groups_per_flex; - struct flex_groups *s_flex_groups; + + /* workqueue for dio unwritten */ + struct workqueue_struct *dio_unwritten_wq; + + struct task_struct *s_mmp_tsk; /* Kernel thread for multiple mount protection */ }; diff --git a/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch b/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch index cd9a250..e5b9b1c 100644 --- a/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch +++ b/ldiskfs/kernel_patches/patches/ext4-osd-iop-common.patch @@ -18,9 +18,9 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/ext4.h linux-2.6.27.21-0.1_2//fs/ext4/ +#define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(dir, &(dentry)->d_name, res_dir) +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir, + struct inode *inode); + extern unsigned int ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize); + extern __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize); extern int ext4_orphan_add(handle_t *, struct inode *); - extern int ext4_orphan_del(handle_t *, struct inode *); - extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4/namei.c --- linux-2.6.27.21-0.1_1//fs/ext4/namei.c 2009-08-24 15:32:00.000000000 +0530 +++ linux-2.6.27.21-0.1_2//fs/ext4/namei.c 2009-08-24 15:43:56.000000000 +0530 @@ -104,7 +104,7 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4 +{ + struct inode *inode; + -+ inode = ext4_new_inode(handle, dir, mode); ++ inode = ext4_new_inode(handle, dir, mode, NULL, 0); + if (!IS_ERR(inode)) { + if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode)) { +#ifdef CONFIG_LDISKFS_FS_XATTR @@ -123,7 +123,7 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4 /* * By the time this is called, we already have created * the directory cache entry for the new file, but it -@@ -1872,39 +1895,31 @@ retry: +@@ -1872,40 +1895,32 @@ retry: return err; } @@ -137,6 +137,7 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4 - struct inode *inode; - struct buffer_head *dir_block; - struct ext4_dir_entry_2 *de; + unsigned int blocksize = dir->i_sb->s_blocksize; - int err, retries = 0; - - if (EXT4_DIR_LINK_MAX(dir)) @@ -155,8 +156,8 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4 if (IS_DIRSYNC(dir)) ext4_handle_sync(handle); -- inode = ext4_new_inode_goal(handle, dir, S_IFDIR | mode, -- ext4_dentry_goal(dir->i_sb, dentry)); +- inode = ext4_new_inode(handle, dir, S_IFDIR | mode, &dentry->d_name, +- ext4_dentry_goal(dir->i_sb, dentry)); - err = PTR_ERR(inode); - if (IS_ERR(inode)) - goto out_stop; @@ -205,8 +206,8 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/namei.c linux-2.6.27.21-0.1_2//fs/ext4 + if (IS_DIRSYNC(dir)) + handle->h_sync = 1; + -+ inode = ext4_new_inode_goal(handle, dir, S_IFDIR | mode, -+ ext4_dentry_goal(dir->i_sb, dentry)); ++ inode = ext4_new_inode(handle, dir, S_IFDIR | mode, &dentry->d_name, ++ ext4_dentry_goal(dir->i_sb, dentry)); + err = PTR_ERR(inode); + if (IS_ERR(inode)) + goto out_stop; diff --git a/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch b/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch index b9db2ed..99bb9ff 100644 --- a/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch +++ b/ldiskfs/kernel_patches/patches/ext4-pdir-fix.patch @@ -1,10 +1,10 @@ diff -rupN linux-2.6.27.21-0.1_1//fs/ext4/ext4_i.h linux-2.6.27.21-0.1_2//fs/ext4/ext4_i.h ---- linux-2.6.27.21-0.1_1//fs/ext4/ext4_i.h 2009-08-24 13:00:59.000000000 +0530 -+++ linux-2.6.27.21-0.1_2//fs/ext4/ext4_i.h 2009-08-24 13:01:25.000000000 +0530 +--- linux-2.6.27.21-0.1_1//fs/ext4/ext4.h 2009-08-24 13:00:59.000000000 +0530 ++++ linux-2.6.27.21-0.1_2//fs/ext4/ext4.h 2009-08-24 13:01:25.000000000 +0530 @@ -16,6 +16,7 @@ - #ifndef _EXT4_I - #define _EXT4_I - + #include + #include + #include +#include #include #include diff --git a/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch index d2272bb..dda25ed 100644 --- a/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-prealloc-rhel5.patch @@ -1,7 +1,31 @@ -Index: linux-2.6.18-128.1.6/fs/ext4/ext4_sb.h +Index: linux-2.6.18-128.1.6/fs/ext4/super.c =================================================================== ---- linux-2.6.18-128.1.6.orig/fs/ext4/ext4_sb.h 2009-05-28 17:16:51.000000000 +0530 -+++ linux-2.6.18-128.1.6/fs/ext4/ext4_sb.h 2009-05-28 17:16:52.000000000 +0530 +--- linux-2.6.18-128.1.6.orig/fs/ext4/super.c ++++ linux-2.6.18-128.1.6/fs/ext4/super.c +@@ -108,7 +108,8 @@ + EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan); + EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan); + EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs); +-EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request); ++EXT4_RW_ATTR_SBI_UI(mb_small_req, s_mb_small_req); ++EXT4_RW_ATTR_SBI_UI(mb_large_req, s_mb_large_req); + EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc); + EXT4_RW_ATTR_SBI_UI(max_dir_size, s_max_dir_size); + +@@ -108,7 +108,8 @@ + ATTR_LIST(mb_max_to_scan), + ATTR_LIST(mb_min_to_scan), + ATTR_LIST(mb_order2_req), +- ATTR_LIST(mb_stream_req), ++ ATTR_LIST(mb_small_req), ++ ATTR_LIST(mb_large_req), + ATTR_LIST(mb_group_prealloc), + ATTR_LIST(max_dir_size), + NULL, +Index: linux-2.6.18-128.1.6/fs/ext4/ext4.h +=================================================================== +--- linux-2.6.18-128.1.6.orig/fs/ext4/ext4.h 2009-05-28 17:16:51.000000000 +0530 ++++ linux-2.6.18-128.1.6/fs/ext4/ext4.h 2009-05-28 17:16:52.000000000 +0530 @@ -108,11 +108,14 @@ /* tunables */ @@ -22,17 +46,8 @@ Index: linux-2.6.18-128.1.6/fs/ext4/mballoc.c =================================================================== --- linux-2.6.18-128.1.6.orig/fs/ext4/mballoc.c 2009-05-28 17:16:51.000000000 +0530 +++ linux-2.6.18-128.1.6/fs/ext4/mballoc.c 2009-05-28 17:19:57.000000000 +0530 -@@ -1744,7 +1744,7 @@ - if (size < isize) - size = isize; - -- if (size < sbi->s_mb_stream_request && -+ if ((ac->ac_g_ex.fe_len < sbi->s_mb_large_req) && - (ac->ac_flags & EXT4_MB_HINT_DATA)) { - /* TBD: may be hot point */ - spin_lock(&sbi->s_md_lock); -@@ -2484,6 +2484,26 @@ - return -ENOMEM; +@@ -2284,6 +2284,26 @@ + } } +static void ext4_mb_prealloc_table_add(struct ext4_sb_info *sbi, int value) @@ -55,78 +70,15 @@ Index: linux-2.6.18-128.1.6/fs/ext4/mballoc.c +} + + - int ext4_mb_init(struct super_block *sb, int needs_recovery) + static int ext4_mb_good_group(struct ext4_allocation_context *ac, + ext4_group_t group, int cr) { - struct ext4_sb_info *sbi = EXT4_SB(sb); -@@ -2542,13 +2562,57 @@ - sbi->s_mb_max_to_scan = MB_DEFAULT_MAX_TO_SCAN; - sbi->s_mb_min_to_scan = MB_DEFAULT_MIN_TO_SCAN; - sbi->s_mb_stats = MB_DEFAULT_STATS; -- sbi->s_mb_stream_request = MB_DEFAULT_STREAM_THRESHOLD; - sbi->s_mb_order2_reqs = MB_DEFAULT_ORDER2_REQS; - sbi->s_mb_history_filter = EXT4_MB_HISTORY_DEFAULT; -- sbi->s_mb_group_prealloc = MB_DEFAULT_GROUP_PREALLOC; -+ -+ if (sbi->s_stripe == 0) { -+ sbi->s_mb_prealloc_table_size = 10; -+ i = sbi->s_mb_prealloc_table_size * sizeof(unsigned long); -+ sbi->s_mb_prealloc_table = kmalloc(i, GFP_NOFS); -+ if (sbi->s_mb_prealloc_table == NULL) { -+ kfree(sbi->s_mb_offsets); -+ kfree(sbi->s_mb_maxs); -+ return -ENOMEM; -+ } -+ memset(sbi->s_mb_prealloc_table, 0, i); +@@ -2325,6 +2389,80 @@ + .llseek = seq_lseek, + .release = seq_release, + }; + -+ ext4_mb_prealloc_table_add(sbi, 4); -+ ext4_mb_prealloc_table_add(sbi, 8); -+ ext4_mb_prealloc_table_add(sbi, 16); -+ ext4_mb_prealloc_table_add(sbi, 32); -+ ext4_mb_prealloc_table_add(sbi, 64); -+ ext4_mb_prealloc_table_add(sbi, 128); -+ ext4_mb_prealloc_table_add(sbi, 256); -+ ext4_mb_prealloc_table_add(sbi, 512); -+ ext4_mb_prealloc_table_add(sbi, 1024); -+ ext4_mb_prealloc_table_add(sbi, 2048); -+ -+ sbi->s_mb_small_req = 256; -+ sbi->s_mb_large_req = 1024; -+ sbi->s_mb_group_prealloc = 512; -+ } else { -+ sbi->s_mb_prealloc_table_size = 3; -+ i = sbi->s_mb_prealloc_table_size * sizeof(unsigned long); -+ sbi->s_mb_prealloc_table = kmalloc(i, GFP_NOFS); -+ if (sbi->s_mb_prealloc_table == NULL) { -+ kfree(sbi->s_mb_offsets); -+ kfree(sbi->s_mb_maxs); -+ return -ENOMEM; -+ } -+ memset(sbi->s_mb_prealloc_table, 0, i); -+ -+ ext4_mb_prealloc_table_add(sbi, sbi->s_stripe); -+ ext4_mb_prealloc_table_add(sbi, sbi->s_stripe * 2); -+ ext4_mb_prealloc_table_add(sbi, sbi->s_stripe * 4); -+ -+ sbi->s_mb_small_req = sbi->s_stripe; -+ sbi->s_mb_large_req = sbi->s_stripe * 8; -+ sbi->s_mb_group_prealloc = sbi->s_stripe * 4; -+ } - - sbi->s_locality_groups = alloc_percpu(struct ext4_locality_group); - if (sbi->s_locality_groups == NULL) { -+ kfree(sbi->s_mb_prealloc_table); - kfree(sbi->s_mb_offsets); - kfree(sbi->s_mb_maxs); - return -ENOMEM; -@@ -2725,8 +2789,82 @@ - #define EXT4_MB_MAX_TO_SCAN_NAME "max_to_scan" - #define EXT4_MB_MIN_TO_SCAN_NAME "min_to_scan" - #define EXT4_MB_ORDER2_REQ "order2_req" --#define EXT4_MB_STREAM_REQ "stream_req" -+#define EXT4_MB_SMALL_REQ "small_req" -+#define EXT4_MB_LARGE_REQ "large_req" +#define EXT4_MB_PREALLOC_TABLE "prealloc_table" - #define EXT4_MB_GROUP_PREALLOC "group_prealloc" + +static int ext4_mb_prealloc_table_proc_read(char *page, char **start, off_t off, + int count, int *eof, void *data) @@ -200,58 +152,90 @@ Index: linux-2.6.18-128.1.6/fs/ext4/mballoc.c + return cnt; +} - #define MB_PROC_FOPS(name) \ - static int ext4_mb_##name##_proc_show(struct seq_file *m, void *v) \ -@@ -2795,6 +2932,7 @@ - mode_t mode = S_IFREG | S_IRUGO | S_IWUSR; - struct ext4_sb_info *sbi = EXT4_SB(sb); - struct proc_dir_entry *proc; -+ struct proc_dir_entry *proc_entry; - - if (sbi->s_proc == NULL) - return -EINVAL; -@@ -2808,13 +2946,28 @@ - EXT4_PROC_HANDLER(EXT4_MB_MAX_TO_SCAN_NAME, mb_max_to_scan); - EXT4_PROC_HANDLER(EXT4_MB_MIN_TO_SCAN_NAME, mb_min_to_scan); - EXT4_PROC_HANDLER(EXT4_MB_ORDER2_REQ, mb_order2_reqs); -- EXT4_PROC_HANDLER(EXT4_MB_STREAM_REQ, mb_stream_request); -+ EXT4_PROC_HANDLER(EXT4_MB_SMALL_REQ, mb_small_req); -+ EXT4_PROC_HANDLER(EXT4_MB_LARGE_REQ, mb_large_req); - EXT4_PROC_HANDLER(EXT4_MB_GROUP_PREALLOC, mb_group_prealloc); + static void ext4_mb_history_release(struct super_block *sb) + { +@@ -2400,6 +2400,7 @@ + remove_proc_entry("mb_groups", sbi->s_proc); + if (sbi->s_mb_history_max) + remove_proc_entry("mb_history", sbi->s_proc); ++ remove_proc_entry(EXT4_MB_PREALLOC_TABLE, sbi->s_proc); + } + kfree(sbi->s_mb_history); + } +@@ -2408,6 +2446,13 @@ + p->proc_fops = &ext4_mb_seq_groups_fops; + p->data = sb; + } ++ p = create_proc_entry(EXT4_MB_PREALLOC_TABLE, S_IFREG | ++ S_IRUGO | S_IWUSR, sbi->s_proc); ++ if (p) { ++ p->data = sbi; ++ p->read_proc = ext4_mb_prealloc_table_proc_read; ++ p->write_proc = ext4_mb_prealloc_table_proc_write; ++ } + } + + sbi->s_mb_history_cur = 0; +@@ -2542,13 +2562,57 @@ + sbi->s_mb_max_to_scan = MB_DEFAULT_MAX_TO_SCAN; + sbi->s_mb_min_to_scan = MB_DEFAULT_MIN_TO_SCAN; + sbi->s_mb_stats = MB_DEFAULT_STATS; +- sbi->s_mb_stream_request = MB_DEFAULT_STREAM_THRESHOLD; + sbi->s_mb_order2_reqs = MB_DEFAULT_ORDER2_REQS; + sbi->s_mb_history_filter = EXT4_MB_HISTORY_DEFAULT; +- sbi->s_mb_group_prealloc = MB_DEFAULT_GROUP_PREALLOC; + -+ proc_entry = create_proc_entry(EXT4_MB_PREALLOC_TABLE, S_IFREG | -+ S_IRUGO | S_IWUSR, sbi->s_proc); -+ if (proc_entry == NULL) { -+ printk(KERN_ERR "EXT4-fs: unable to create %s\n", -+ EXT4_MB_PREALLOC_TABLE); -+ goto err_out; -+ } -+ proc_entry->data = sbi; -+ proc_entry->read_proc = ext4_mb_prealloc_table_proc_read; -+ proc_entry->write_proc = ext4_mb_prealloc_table_proc_write; ++ if (sbi->s_stripe == 0) { ++ sbi->s_mb_prealloc_table_size = 10; ++ i = sbi->s_mb_prealloc_table_size * sizeof(unsigned long); ++ sbi->s_mb_prealloc_table = kmalloc(i, GFP_NOFS); ++ if (sbi->s_mb_prealloc_table == NULL) { ++ kfree(sbi->s_mb_offsets); ++ kfree(sbi->s_mb_maxs); ++ return -ENOMEM; ++ } ++ memset(sbi->s_mb_prealloc_table, 0, i); + - return 0; - - err_out: - remove_proc_entry(EXT4_MB_GROUP_PREALLOC, sbi->s_proc); -- remove_proc_entry(EXT4_MB_STREAM_REQ, sbi->s_proc); -+ remove_proc_entry(EXT4_MB_PREALLOC_TABLE, sbi->s_proc); -+ remove_proc_entry(EXT4_MB_LARGE_REQ, sbi->s_proc); -+ remove_proc_entry(EXT4_MB_SMALL_REQ, sbi->s_proc); - remove_proc_entry(EXT4_MB_ORDER2_REQ, sbi->s_proc); - remove_proc_entry(EXT4_MB_MIN_TO_SCAN_NAME, sbi->s_proc); - remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); -@@ -2838,7 +2990,9 @@ - ++ ext4_mb_prealloc_table_add(sbi, 4); ++ ext4_mb_prealloc_table_add(sbi, 8); ++ ext4_mb_prealloc_table_add(sbi, 16); ++ ext4_mb_prealloc_table_add(sbi, 32); ++ ext4_mb_prealloc_table_add(sbi, 64); ++ ext4_mb_prealloc_table_add(sbi, 128); ++ ext4_mb_prealloc_table_add(sbi, 256); ++ ext4_mb_prealloc_table_add(sbi, 512); ++ ext4_mb_prealloc_table_add(sbi, 1024); ++ ext4_mb_prealloc_table_add(sbi, 2048); ++ ++ sbi->s_mb_small_req = 256; ++ sbi->s_mb_large_req = 1024; ++ sbi->s_mb_group_prealloc = 512; ++ } else { ++ sbi->s_mb_prealloc_table_size = 3; ++ i = sbi->s_mb_prealloc_table_size * sizeof(unsigned long); ++ sbi->s_mb_prealloc_table = kmalloc(i, GFP_NOFS); ++ if (sbi->s_mb_prealloc_table == NULL) { ++ kfree(sbi->s_mb_offsets); ++ kfree(sbi->s_mb_maxs); ++ return -ENOMEM; ++ } ++ memset(sbi->s_mb_prealloc_table, 0, i); ++ ++ ext4_mb_prealloc_table_add(sbi, sbi->s_stripe); ++ ext4_mb_prealloc_table_add(sbi, sbi->s_stripe * 2); ++ ext4_mb_prealloc_table_add(sbi, sbi->s_stripe * 4); ++ ++ sbi->s_mb_small_req = sbi->s_stripe; ++ sbi->s_mb_large_req = sbi->s_stripe * 8; ++ sbi->s_mb_group_prealloc = sbi->s_stripe * 4; ++ } - remove_proc_entry(EXT4_MB_GROUP_PREALLOC, sbi->s_proc); -- remove_proc_entry(EXT4_MB_STREAM_REQ, sbi->s_proc); -+ remove_proc_entry(EXT4_MB_PREALLOC_TABLE, sbi->s_proc); -+ remove_proc_entry(EXT4_MB_LARGE_REQ, sbi->s_proc); -+ remove_proc_entry(EXT4_MB_SMALL_REQ, sbi->s_proc); - remove_proc_entry(EXT4_MB_ORDER2_REQ, sbi->s_proc); - remove_proc_entry(EXT4_MB_MIN_TO_SCAN_NAME, sbi->s_proc); - remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); + sbi->s_locality_groups = alloc_percpu(struct ext4_locality_group); + if (sbi->s_locality_groups == NULL) { ++ kfree(sbi->s_mb_prealloc_table); + kfree(sbi->s_mb_offsets); + kfree(sbi->s_mb_maxs); + return -ENOMEM; @@ -3032,11 +3186,12 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, struct ext4_allocation_request *ar) @@ -350,43 +334,22 @@ Index: linux-2.6.18-128.1.6/fs/ext4/mballoc.c /* now prepare goal request */ -@@ -4077,22 +4217,32 @@ - { - struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); - int bsbits = ac->ac_sb->s_blocksize_bits; -- loff_t size, isize; -+ loff_t size; - - if (!(ac->ac_flags & EXT4_MB_HINT_DATA)) - return; - -- size = ac->ac_o_ex.fe_logical + ac->ac_o_ex.fe_len; -- isize = i_size_read(ac->ac_inode) >> bsbits; -- size = max(size, isize); -- -- /* don't use group allocation for large files */ -- if (size >= sbi->s_mb_stream_request) -+ if (ac->ac_o_ex.fe_len >= sbi->s_mb_small_req) - return; +@@ -4077,11 +4217,17 @@ - if (unlikely(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY)) - return; + /* don't use group allocation for large files */ + size = max(size, isize); +- if (size >= sbi->s_mb_stream_request) { ++ if ((ac->ac_o_ex.fe_len >= sbi->s_mb_small_req) || ++ (size >= sbi->s_mb_large_req)) { + ac->ac_flags |= EXT4_MB_STREAM_ALLOC; + return; + } + /* request is so large that we don't care about + * streaming - it overweights any possible seek */ + if (ac->ac_o_ex.fe_len >= sbi->s_mb_large_req) + return; + -+ size = ac->ac_o_ex.fe_logical + ac->ac_o_ex.fe_len; -+ size = size << bsbits; -+ if (size < i_size_read(ac->ac_inode)) -+ size = i_size_read(ac->ac_inode); -+ size = (size + ac->ac_sb->s_blocksize - 1) >> bsbits; -+ -+ /* don't use group allocation for large files */ -+ if (size >= sbi->s_mb_large_req) -+ return; -+ BUG_ON(ac->ac_lg != NULL); /* * locality group prealloc space are per cpu. The reason for having diff --git a/ldiskfs/kernel_patches/patches/ext4-wantedi-2.6-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-wantedi-2.6-rhel5.patch index 4927dd0..20c2c38 100644 --- a/ldiskfs/kernel_patches/patches/ext4-wantedi-2.6-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-wantedi-2.6-rhel5.patch @@ -1,55 +1,8 @@ -Index: linux-stage/fs/ext4/ialloc.c +Index: linux-2.6.18-194.3.1/fs/ext4/namei.c =================================================================== ---- linux-stage.orig/fs/ext4/ialloc.c -+++ linux-stage/fs/ext4/ialloc.c -@@ -675,7 +675,8 @@ err_ret: - * For other inodes, search forward from the parent directory's block - * group to find a free inode. - */ --struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode) -+struct inode *ext4_new_inode_goal(handle_t *handle, struct inode *dir, -+ int mode, unsigned goal) - { - struct super_block *sb; - struct buffer_head *inode_bitmap_bh = NULL; -@@ -706,6 +707,14 @@ struct inode *ext4_new_inode(handle_t *h - sbi = EXT4_SB(sb); - es = sbi->s_es; - -+ if (goal && goal <= le32_to_cpu(es->s_inodes_count)) { -+ group = (goal - 1) / EXT4_INODES_PER_GROUP(sb); -+ ino = (goal - 1) % EXT4_INODES_PER_GROUP(sb); -+ -+ ret2 = 0; -+ goto got_group; -+ } -+ - if (sbi->s_log_groups_per_flex) { - ret2 = find_group_flex(sb, dir, &group); - goto got_group; -@@ -724,7 +733,7 @@ got_group: - if (ret2 == -1) - goto out; - -- for (i = 0; i < sbi->s_groups_count; i++) { -+ for (i = 0; i < sbi->s_groups_count; i++, ino = 0) { - err = -EIO; - - gdp = ext4_get_group_desc(sb, group, &group_desc_bh); -@@ -736,8 +745,6 @@ got_group: - if (!inode_bitmap_bh) - goto fail; - -- ino = 0; -- - repeat_in_this_group: - ino = ext4_find_next_zero_bit((unsigned long *) - inode_bitmap_bh->b_data, -Index: linux-stage/fs/ext4/namei.c -=================================================================== ---- linux-stage.orig/fs/ext4/namei.c -+++ linux-stage/fs/ext4/namei.c -@@ -149,6 +149,17 @@ struct dx_map_entry +--- linux-2.6.18-194.3.1.orig/fs/ext4/namei.c ++++ linux-2.6.18-194.3.1/fs/ext4/namei.c +@@ -148,6 +148,17 @@ struct dx_map_entry u16 size; }; @@ -67,7 +20,7 @@ Index: linux-stage/fs/ext4/namei.c static inline ext4_lblk_t dx_get_block(struct dx_entry *entry); static void dx_set_block(struct dx_entry *entry, ext4_lblk_t value); static inline unsigned dx_get_hash(struct dx_entry *entry); -@@ -1716,6 +1727,19 @@ static int ext4_add_nondir(handle_t *han +@@ -1761,6 +1772,19 @@ static int ext4_add_nondir(handle_t *han return err; } @@ -87,108 +40,45 @@ Index: linux-stage/fs/ext4/namei.c /* * By the time this is called, we already have created * the directory cache entry for the new file, but it -@@ -1741,7 +1766,8 @@ retry: +@@ -1786,7 +1810,8 @@ retry: if (IS_DIRSYNC(dir)) - handle->h_sync = 1; + ext4_handle_sync(handle); -- inode = ext4_new_inode (handle, dir, mode); -+ inode = ext4_new_inode_goal(handle, dir, mode, -+ ext4_dentry_goal(dir->i_sb, dentry)); +- inode = ext4_new_inode(handle, dir, mode, &dentry->d_name, 0); ++ inode = ext4_new_inode(handle, dir, mode, &dentry->d_name, ++ ext4_dentry_goal(dir->i_sb, dentry)); err = PTR_ERR(inode); if (!IS_ERR(inode)) { inode->i_op = &ext4_file_inode_operations; -@@ -1775,7 +1800,8 @@ retry: +@@ -1820,7 +1845,8 @@ retry: if (IS_DIRSYNC(dir)) - handle->h_sync = 1; + ext4_handle_sync(handle); -- inode = ext4_new_inode(handle, dir, mode); -+ inode = ext4_new_inode_goal(handle, dir, mode, -+ ext4_dentry_goal(dir->i_sb, dentry)); +- inode = ext4_new_inode(handle, dir, mode, &dentry->d_name, 0); ++ inode = ext4_new_inode(handle, dir, mode, &dentry->d_name, ++ ext4_dentry_goal(dir->i_sb, dentry)); err = PTR_ERR(inode); if (!IS_ERR(inode)) { init_special_inode(inode, inode->i_mode, rdev); -@@ -1811,7 +1836,8 @@ retry: +@@ -1857,8 +1883,8 @@ retry: if (IS_DIRSYNC(dir)) - handle->h_sync = 1; + ext4_handle_sync(handle); -- inode = ext4_new_inode(handle, dir, S_IFDIR | mode); -+ inode = ext4_new_inode_goal(handle, dir, S_IFDIR | mode, -+ ext4_dentry_goal(dir->i_sb, dentry)); +- inode = ext4_new_inode(handle, dir, S_IFDIR | mode, +- &dentry->d_name, 0); ++ inode = ext4_new_inode(handle, dir, S_IFDIR | mode, &dentry->d_name, ++ ext4_dentry_goal(dir->i_sb, dentry)); err = PTR_ERR(inode); if (IS_ERR(inode)) goto out_stop; -@@ -2211,7 +2236,8 @@ retry: +@@ -2270,8 +2296,8 @@ retry: if (IS_DIRSYNC(dir)) - handle->h_sync = 1; + ext4_handle_sync(handle); -- inode = ext4_new_inode(handle, dir, S_IFLNK|S_IRWXUGO); -+ inode = ext4_new_inode_goal(handle, dir, S_IFLNK|S_IRWXUGO, -+ ext4_dentry_goal(dir->i_sb, dentry)); +- inode = ext4_new_inode(handle, dir, S_IFLNK|S_IRWXUGO, +- &dentry->d_name, 0); ++ inode = ext4_new_inode(handle, dir, S_IFLNK|S_IRWXUGO, &dentry->d_name, ++ ext4_dentry_goal(dir->i_sb, dentry)); err = PTR_ERR(inode); if (IS_ERR(inode)) goto out_stop; -Index: linux-stage/fs/ext4/ext4.h -=================================================================== ---- linux-stage.orig/fs/ext4/ext4.h -+++ linux-stage/fs/ext4/ext4.h -@@ -1032,7 +1032,14 @@ extern int ext4fs_dirhash(const char *na - dx_hash_info *hinfo); - - /* ialloc.c */ --extern struct inode * ext4_new_inode(handle_t *, struct inode *, int); -+extern struct inode *ext4_new_inode_goal(handle_t *handle, struct inode *dir, -+ int mode, unsigned goal); -+static inline struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, -+ int mode) -+{ -+ return ext4_new_inode_goal(handle, dir, mode, -+ EXT4_SB(dir->i_sb)->s_inode_goal); -+} - extern void ext4_free_inode(handle_t *, struct inode *); - extern struct inode * ext4_orphan_get(struct super_block *, unsigned long); - extern unsigned long ext4_count_free_inodes(struct super_block *); -Index: linux-stage/fs/ext4/super.c -=================================================================== ---- linux-stage.orig/fs/ext4/super.c -+++ linux-stage/fs/ext4/super.c -@@ -560,6 +560,7 @@ static void ext4_put_super(struct super_ - } - if (sbi->s_proc) { - remove_proc_entry("inode_readahead_blks", sbi->s_proc); -+ remove_proc_entry("inode_goal", sbi->s_proc); - remove_proc_entry(sb->s_id, ext4_proc_root); - } - -@@ -2274,6 +2275,11 @@ static int ext4_fill_super(struct super_ - p->proc_fops = &ext4_ui_proc_fops; - p->data = &sbi->s_inode_readahead_blks; - } -+ p = create_proc_entry("inode_goal", 0644, sbi->s_proc); -+ if (p) { -+ p->proc_fops = &ext4_ui_proc_fops, -+ p->data = &sbi->s_inode_goal; -+ } - } - #endif - -@@ -2553,6 +2558,7 @@ failed_mount2: - failed_mount: - if (sbi->s_proc) { - remove_proc_entry("inode_readahead_blks", sbi->s_proc); -+ remove_proc_entry("inode_goal", sbi->s_proc); - remove_proc_entry(sb->s_id, ext4_proc_root); - } - #ifdef CONFIG_QUOTA -Index: linux-stage/fs/ext4/ext4_sb.h -=================================================================== ---- linux-stage.orig/fs/ext4/ext4_sb.h -+++ linux-stage/fs/ext4/ext4_sb.h -@@ -53,6 +53,7 @@ struct ext4_sb_info { - int s_inode_size; - int s_first_ino; - unsigned int s_inode_readahead_blks; -+ unsigned int s_inode_goal; - spinlock_t s_next_gen_lock; - u32 s_next_generation; - u32 s_hash_seed[4]; - diff --git a/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch b/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch index 9f3ce99..4a88db0 100644 --- a/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch +++ b/ldiskfs/kernel_patches/patches/ext4_data_in_dirent.patch @@ -49,9 +49,9 @@ Index: b/fs/ext4/dir.c @@ -175,7 +182,7 @@ revalidate: * failure will be detected in the * dirent test below. */ - if (ext4_rec_len_from_disk(de->rec_len) -- < EXT4_DIR_REC_LEN(1)) -+ < __EXT4_DIR_REC_LEN(1)) + if (ext4_rec_len_from_disk(de->rec_len, +- sb->s_blocksize) < EXT4_DIR_REC_LEN(1)) ++ sb->s_blocksize) < __EXT4_DIR_REC_LEN(1)) break; i += ext4_rec_len_from_disk(de->rec_len); } @@ -61,8 +61,8 @@ Index: b/fs/ext4/dir.c int len; + int extra_data = 1; - info = (struct dir_private_info *) dir_file->private_data; - p = &info->root.rb_node; + info = (struct dir_private_info *) dir_file->private_data; + p = &info->root.rb_node; /* Create and allocate the fname structure */ - len = sizeof(struct fname) + dirent->name_len + 1; @@ -169,14 +169,13 @@ Index: b/fs/ext4/ext4.h extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir, - struct inode *inode); + struct inode *inode, const void *, const void *); + extern unsigned int ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize); + extern __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize); extern int ext4_orphan_add(handle_t *, struct inode *); - extern int ext4_orphan_del(handle_t *, struct inode *); - extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, -@@ -1343,7 +1386,28 @@ static inline int ext4_is_group_locked(s +@@ -1343,6 +1386,28 @@ static inline int ext4_is_group_locked(s + return spin_is_locked(ext4_group_lock_ptr(sb, group)); } - -- +/* + * Compute the total directory entry data length. + * This includes the filename and an implicit NUL terminator (always present), @@ -247,7 +246,7 @@ Index: b/fs/ext4/namei.c + unsigned entry_space; + + BUG_ON(dot_de->name_len != 1); -+ dotdot_de = ext4_next_entry(dot_de); ++ dotdot_de = ext4_next_entry(dot_de, blocksize); + entry_space = blocksize - EXT4_DIR_REC_LEN(dot_de) - + EXT4_DIR_REC_LEN(dotdot_de) - infosize; + @@ -286,7 +285,7 @@ Index: b/fs/ext4/namei.c dir->i_sb->s_blocksize - - EXT4_DIR_REC_LEN(0)); + __EXT4_DIR_REC_LEN(0)); - for (; de < top; de = ext4_next_entry(de)) { + for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) { if (!ext4_check_dir_entry("htree_dirblock_to_tree", dir, de, bh, (block<i_sb)) @@ -1026,7 +1036,7 @@ static struct buffer_head * ext4_dx_find @@ -295,13 +294,13 @@ Index: b/fs/ext4/namei.c top = (struct ext4_dir_entry_2 *) ((char *) de + sb->s_blocksize - - EXT4_DIR_REC_LEN(0)); + __EXT4_DIR_REC_LEN(0)); - for (; de < top; de = ext4_next_entry(de)) { + for (; de < top; de = ext4_next_entry(de, sb->s_blocksize)) { int off = (block << EXT4_BLOCK_SIZE_BITS(sb)) + ((char *) de - bh->b_data); @@ -1193,7 +1203,7 @@ dx_move_dirents(char *from, char *to, st - while (count--) { - struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) (from + map->offs); + struct ext4_dir_entry_2 *de = (struct ext4_dir_entry_2 *) + (from + (map->offs<<2)); - rec_len = EXT4_DIR_REC_LEN(de->name_len); + rec_len = EXT4_DIR_REC_LEN(de); memcpy (to, de, rec_len); @@ -341,7 +340,7 @@ Index: b/fs/ext4/namei.c } - nlen = EXT4_DIR_REC_LEN(de->name_len); + nlen = EXT4_DIR_REC_LEN(de); - rlen = ext4_rec_len_from_disk(de->rec_len); + rlen = ext4_rec_len_from_disk(de->rec_len, blocksize); if ((de->inode? rlen - nlen: rlen) >= reclen) break; @@ -1383,7 +1399,7 @@ static int add_dirent_to_buf(handle_t *h @@ -350,7 +349,7 @@ Index: b/fs/ext4/namei.c /* By now the buffer is marked for journaling */ - nlen = EXT4_DIR_REC_LEN(de->name_len); + nlen = EXT4_DIR_REC_LEN(de); - rlen = ext4_rec_len_from_disk(de->rec_len); + rlen = ext4_rec_len_from_disk(de->rec_len, blocksize); if (de->inode) { struct ext4_dir_entry_2 *de1 = (struct ext4_dir_entry_2 *)((char *)de + nlen); @@ -1399,6 +1415,12 @@ static int add_dirent_to_buf(handle_t *h @@ -432,7 +431,7 @@ Index: b/fs/ext4/namei.c out_journal: if (journal) { -@@ -1972,11 +2007,12 @@ retry: +@@ -1972,12 +2007,13 @@ retry: /* Initialize @inode as a subdirectory of @dir, and add the * "." and ".." entries into the first directory block. */ int ext4_add_dot_dotdot(handle_t *handle, struct inode * dir, @@ -440,6 +439,7 @@ Index: b/fs/ext4/namei.c + struct inode *inode, + const void *data1, const void *data2) { + unsigned int blocksize = dir->i_sb->s_blocksize; struct buffer_head * dir_block; struct ext4_dir_entry_2 * de; - int err = 0; @@ -447,11 +447,12 @@ Index: b/fs/ext4/namei.c if (IS_ERR(handle)) return PTR_ERR(handle); -@@ -1993,16 +2029,34 @@ int ext4_add_dot_dotdot(handle_t *handle +@@ -1993,17 +2029,34 @@ int ext4_add_dot_dotdot(handle_t *handle de = (struct ext4_dir_entry_2 *) dir_block->b_data; de->inode = cpu_to_le32(inode->i_ino); de->name_len = 1; -- de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len)); +- de->rec_len = ext4_rec_len_to_disk(EXT4_DIR_REC_LEN(de->name_len), +- blocksize); strcpy(de->name, "."); ext4_set_de_type(dir->i_sb, de, S_IFDIR); + /* get packed fid data*/ @@ -465,11 +466,11 @@ Index: b/fs/ext4/namei.c + de->rec_len = cpu_to_le16(EXT4_DIR_REC_LEN(de)); + dot_reclen = cpu_to_le16(de->rec_len); + - de = ext4_next_entry(de); + de = ext4_next_entry(de, blocksize); de->inode = cpu_to_le32(dir->i_ino); - de->rec_len = ext4_rec_len_to_disk(inode->i_sb->s_blocksize - -- EXT4_DIR_REC_LEN(1)); -+ dot_reclen); +- de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(1), ++ de->rec_len = ext4_rec_len_to_disk(blocksize - dot_reclen, + blocksize); de->name_len = 2; strcpy(de->name, ".."); ext4_set_de_type(dir->i_sb, de, S_IFDIR); diff --git a/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5-ext4.patch b/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5-ext4.patch index eb53ca1..d5e2c23 100644 --- a/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5-ext4.patch +++ b/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5-ext4.patch @@ -345,9 +345,9 @@ Index: linux-2.6.18-128.1.6/fs/ext4/super.c --- linux-2.6.18-128.1.6.orig/fs/ext4/super.c +++ linux-2.6.18-128.1.6/fs/ext4/super.c @@ -888,7 +888,8 @@ enum { - Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_stripe, Opt_delalloc, Opt_nodelalloc, + Opt_block_validity, Opt_noblock_validity, - Opt_inode_readahead_blks, Opt_journal_ioprio + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_iopen, Opt_noiopen, Opt_iopen_nopriv, @@ -491,22 +491,21 @@ Index: linux-2.6.18-128.1.6/fs/ext4/Makefile +++ linux-2.6.18-128.1.6/fs/ext4/Makefile @@ -4,7 +4,7 @@ - obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o + obj-$(CONFIG_EXT4_FS) += ext4.o -ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ +ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \ - ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \ - ext4_jbd2.o migrate.o mballoc.o + ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \ + ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o Index: linux-2.6.18-128.1.6/fs/ext4/ext4.h =================================================================== --- linux-2.6.18-128.1.6.orig/fs/ext4/ext4.h +++ linux-2.6.18-128.1.6/fs/ext4/ext4.h @@ -537,6 +538,8 @@ do { \ - #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ - #define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */ #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ + #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */ +#define EXT4_MOUNT_IOPEN 0x20000000 /* Allow access via iopen */ +#define EXT4_MOUNT_IOPEN_NOPRIV 0x40000000 /* Make iopen world-readable */ 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 6655978..77c8d9a 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5-ext4.series @@ -3,9 +3,7 @@ ext4-wantedi-2.6-rhel5.patch iopen-2.6.18-rhel5-ext4.patch ext4-map_inode_page-2.6.18-rhel5.patch export-ext4-2.6-rhel5.patch -ext4-include-fixes-2.6-rhel5.patch ext4-remove-cond_resched-calls-rhel5.patch -ext4-filterdata-rhel5.patch ext4-inode-version-rhel5.patch ext4-mmp-rhel5.patch ext4-lookup-dotdot-rhel5.patch @@ -17,7 +15,6 @@ ext4-mballoc-extra-checks-rhel5.patch ext4-big-endian-check-2.6-rhel5.patch ext4-alloc-policy-2.6-rhel5.patch ext4-misc-rhel5.patch -ext4-convert-group-lock-rhel5.patch ext4-force_over_16tb-rhel5.patch ext4-pdir-fix.patch ext4-osd-iop-common.patch @@ -27,10 +24,9 @@ ext4-dynlocks-2.6-rhel5.patch ext4-hash-indexed-dir-dotdot-update-rhel5.patch ext4-ext_generation-sles11.patch ext4-kill-dx_root.patch -ext4-extents-mount-option-rhel5.patch ext4-fiemap-2.6-rhel5.patch ext4-mballoc-pa_free-mismatch.patch ext4_data_in_dirent.patch ext4-disable-mb-cache-rhel5.patch -ext4-remove-extents-warning-rhel5.patch ext4-disable-delalloc-rhel5.patch +ext4-back-dquot-to-rhel54.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index d631a15..b103fda 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,12 +1,12 @@ TBD Oracle, Inc. * version 2.1.0 * Server support for kernels: - 2.6.18-164.11.1.el5 (RHEL 5) - 2.6.18-164.11.1.0.1.el5 (OEL 5) + 2.6.18-194.11.3.el5 (RHEL 5) + 2.6.18-194.11.3.0.1.el5 (OEL 5) * Client support for unpatched kernels: (see http://wiki.lustre.org/index.php?title=Patchless_Client) - 2.6.18-164.11.1.el5 (RHEL 5), - 2.6.18-164.11.1.0.1.el5 (OEL 5) + 2.6.18-194.11.3.el5 (RHEL 5), + 2.6.18-194.11.3.0.1.el5 (OEL 5) 2.6.16.60-0.42.8 (SLES 10), 2.6.27.19-5 (SLES11) 2.6.29.4-167.fc11 (FC11) @@ -15,6 +15,11 @@ TBD Oracle, Inc. Lustre filesystem with 4K stack may cause a stack overflow. For more information, please refer to bugzilla 17630. +Severity : enhancement +Bugzilla : 22514 +Description: Update RHEL5.5 kernel to 2.6.18-194.11.3.el5 and OEL5.5 kernel to + 2.6.18-194.11.3.0.1.el5. + -------------------------------------------------------------------------------- 2010-07-15 Oracle, Inc. @@ -37,7 +42,6 @@ Description: Distribute lfs_migrate script with lustre Details : The lfs_migrate mentioned in the manual is now included in the lustre tree in lustre/scripts and will distributed in lustre RPMs. - Severity : enhancement Bugzilla : 15253 Description: Failover nid list added to import proc file. diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 5d8c402..3958e0b 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -2332,7 +2332,7 @@ AC_DEFUN([LC_QUOTA64], AC_MSG_RESULT([yes]) ],[ tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-I $LINUX/fs" + EXTRA_KCFLAGS="-I$LINUX/fs" LB_LINUX_TRY_COMPILE([ #include #include diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config index 5810494..b4072b6 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Nov 5 09:05:37 2009 +# Fri May 28 00:57:51 2010 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -58,6 +58,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -166,8 +167,8 @@ CONFIG_TICK_DIVIDER=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -259,9 +260,11 @@ CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_WMI=m CONFIG_ACPI_ASUS=m # CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=1999 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -270,6 +273,7 @@ CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m +CONFIG_DELL_WMI=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -346,9 +350,13 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set @@ -690,8 +698,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -825,31 +831,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -857,6 +853,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -1167,9 +1165,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m -CONFIG_SCSI_ISCSI2_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_ISCSI1_ATTRS is not set +# CONFIG_SCSI_ISCSI2_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1181,10 +1179,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1240,12 +1239,14 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m +# CONFIG_SCSI_QLA_ISCSI is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1256,6 +1257,7 @@ CONFIG_PCMCIA_FDOMAIN=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1494,6 +1496,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1512,13 +1515,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1529,6 +1537,8 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y # # Token Ring devices @@ -1543,6 +1553,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1593,6 +1604,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1609,41 +1621,33 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1862,6 +1866,7 @@ CONFIG_ISDN_DIVAS_MAINT=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -2175,27 +2180,34 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -2207,21 +2219,31 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2470,6 +2492,7 @@ CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2707,6 +2730,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2779,31 +2803,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2820,6 +2820,7 @@ CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5400=m CONFIG_EDAC_I82860=m @@ -2902,6 +2903,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -3126,6 +3128,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -3176,7 +3181,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3265,7 +3270,6 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config index 24a2b5f..fbfda66 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-ia64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Nov 5 09:06:18 2009 +# Fri May 28 01:05:18 2010 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -45,6 +45,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -208,6 +209,8 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_NUMA=y +CONFIG_ACPI_WMI=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -245,6 +248,9 @@ CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_STUB=y @@ -572,8 +578,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -707,31 +711,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -739,6 +733,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -942,7 +938,7 @@ CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m +# CONFIG_SCSI_ISCSI1_ATTRS is not set CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m @@ -955,10 +951,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1013,6 +1010,8 @@ CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1021,6 +1020,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1247,6 +1247,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1265,13 +1266,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1282,6 +1288,7 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m # # Token Ring devices @@ -1295,6 +1302,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1337,6 +1345,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1347,41 +1356,33 @@ CONFIG_HOSTAP_CS=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1588,6 +1589,7 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -1861,26 +1863,26 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m -CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -1892,18 +1894,27 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2134,6 +2145,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2370,6 +2382,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2441,32 +2454,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2547,6 +2535,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2791,6 +2780,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -2829,7 +2821,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config index 76f4139..5ad2197 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-oel5-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Nov 5 09:02:58 2009 +# Fri May 28 00:51:35 2010 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -64,6 +64,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -138,8 +139,8 @@ CONFIG_MTRR=y CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -232,9 +233,11 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_NUMA=y +CONFIG_ACPI_WMI=m CONFIG_ACPI_ASUS=m # CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -244,6 +247,7 @@ CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m +CONFIG_DELL_WMI=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -290,6 +294,7 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m CONFIG_IOMMU_API=y CONFIG_DMAR=y # CONFIG_DMAR_DEFAULT_ON is not set @@ -298,6 +303,9 @@ CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set @@ -635,8 +643,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -770,31 +776,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -802,6 +798,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -1108,9 +1106,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m -CONFIG_SCSI_ISCSI2_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_ISCSI1_ATTRS is not set +# CONFIG_SCSI_ISCSI2_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1122,10 +1120,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1179,11 +1178,13 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m +# CONFIG_SCSI_QLA_ISCSI is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1192,6 +1193,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1428,6 +1430,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1446,13 +1449,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1463,6 +1471,8 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y # # Token Ring devices @@ -1476,6 +1486,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1526,6 +1537,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1542,41 +1554,33 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1784,6 +1788,7 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -2086,27 +2091,34 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -2118,21 +2130,31 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2373,6 +2395,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2610,6 +2633,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2682,32 +2706,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2721,9 +2720,11 @@ CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5400=m CONFIG_EDAC_K8=m +CONFIG_EDAC_AMD64=m CONFIG_EDAC_POLL=y # @@ -2810,6 +2811,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -3038,6 +3040,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -3078,7 +3083,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3164,7 +3169,6 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y 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 b06a4dd..7e339f5 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 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Nov 5 09:05:37 2009 +# Fri May 28 00:57:51 2010 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -58,6 +58,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -166,8 +167,8 @@ CONFIG_TICK_DIVIDER=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -259,9 +260,11 @@ CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_WMI=m CONFIG_ACPI_ASUS=m # CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=1999 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -270,6 +273,7 @@ CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m +CONFIG_DELL_WMI=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -346,9 +350,13 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set @@ -690,8 +698,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -825,31 +831,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -857,6 +853,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -1167,9 +1165,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m -CONFIG_SCSI_ISCSI2_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_ISCSI1_ATTRS is not set +# CONFIG_SCSI_ISCSI2_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1181,10 +1179,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1240,12 +1239,14 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m +# CONFIG_SCSI_QLA_ISCSI is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1256,6 +1257,7 @@ CONFIG_PCMCIA_FDOMAIN=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1494,6 +1496,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1512,13 +1515,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1529,6 +1537,8 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y # # Token Ring devices @@ -1543,6 +1553,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1593,6 +1604,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1609,41 +1621,33 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1862,6 +1866,7 @@ CONFIG_ISDN_DIVAS_MAINT=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -2175,27 +2180,34 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -2207,21 +2219,31 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2470,6 +2492,7 @@ CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2707,6 +2730,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2779,31 +2803,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2820,6 +2820,7 @@ CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5400=m CONFIG_EDAC_I82860=m @@ -2902,6 +2903,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -3126,6 +3128,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -3176,7 +3181,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3265,7 +3270,6 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y 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 b06a4dd..7e339f5 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 -# Thu Nov 5 09:05:37 2009 +# Fri May 28 00:57:51 2010 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -58,6 +58,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -166,8 +167,8 @@ CONFIG_TICK_DIVIDER=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -259,9 +260,11 @@ CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_WMI=m CONFIG_ACPI_ASUS=m # CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=1999 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -270,6 +273,7 @@ CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_SBS=m +CONFIG_DELL_WMI=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -346,9 +350,13 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set @@ -690,8 +698,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -825,31 +831,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -857,6 +853,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -1167,9 +1165,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m -CONFIG_SCSI_ISCSI2_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_ISCSI1_ATTRS is not set +# CONFIG_SCSI_ISCSI2_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1181,10 +1179,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1240,12 +1239,14 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m +# CONFIG_SCSI_QLA_ISCSI is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1256,6 +1257,7 @@ CONFIG_PCMCIA_FDOMAIN=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1494,6 +1496,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1512,13 +1515,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1529,6 +1537,8 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y # # Token Ring devices @@ -1543,6 +1553,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1593,6 +1604,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1609,41 +1621,33 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1862,6 +1866,7 @@ CONFIG_ISDN_DIVAS_MAINT=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -2175,27 +2180,34 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -2207,21 +2219,31 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2470,6 +2492,7 @@ CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2707,6 +2730,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2779,31 +2803,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2820,6 +2820,7 @@ CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5400=m CONFIG_EDAC_I82860=m @@ -2902,6 +2903,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -3126,6 +3128,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -3176,7 +3181,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3265,7 +3270,6 @@ CONFIG_LIBCRC32C=y CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y 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 24a2b5f..fbfda66 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 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Nov 5 09:06:18 2009 +# Fri May 28 01:05:18 2010 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -45,6 +45,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -208,6 +209,8 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_NUMA=y +CONFIG_ACPI_WMI=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -245,6 +248,9 @@ CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_STUB=y @@ -572,8 +578,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -707,31 +711,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -739,6 +733,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -942,7 +938,7 @@ CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m +# CONFIG_SCSI_ISCSI1_ATTRS is not set CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m @@ -955,10 +951,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1013,6 +1010,8 @@ CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1021,6 +1020,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1247,6 +1247,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1265,13 +1266,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1282,6 +1288,7 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m # # Token Ring devices @@ -1295,6 +1302,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1337,6 +1345,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1347,41 +1356,33 @@ CONFIG_HOSTAP_CS=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1588,6 +1589,7 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -1861,26 +1863,26 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m -CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -1892,18 +1894,27 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2134,6 +2145,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2370,6 +2382,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2441,32 +2454,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2547,6 +2535,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2791,6 +2780,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -2829,7 +2821,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 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 24a2b5f..fbfda66 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 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Nov 5 09:06:18 2009 +# Fri May 28 01:05:18 2010 # CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -45,6 +45,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -208,6 +209,8 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_NUMA=y +CONFIG_ACPI_WMI=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -245,6 +248,9 @@ CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_STUB=y @@ -572,8 +578,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -707,31 +711,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m @@ -739,6 +733,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -942,7 +938,7 @@ CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m +# CONFIG_SCSI_ISCSI1_ATTRS is not set CONFIG_SCSI_ISCSI2_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m @@ -955,10 +951,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1013,6 +1010,8 @@ CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1021,6 +1020,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1247,6 +1247,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1265,13 +1266,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1282,6 +1288,7 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m # # Token Ring devices @@ -1295,6 +1302,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1337,6 +1345,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1347,41 +1356,33 @@ CONFIG_HOSTAP_CS=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1588,6 +1589,7 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -1861,26 +1863,26 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m -CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -1892,18 +1894,27 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -2134,6 +2145,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2370,6 +2382,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2441,32 +2454,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2547,6 +2535,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -2791,6 +2780,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -2829,7 +2821,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 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 cabbce0..13d35ca 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 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Nov 5 09:02:58 2009 +# Fri May 28 00:51:35 2010 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -64,6 +64,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -138,8 +139,8 @@ CONFIG_MTRR=y CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -232,9 +233,11 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_NUMA=y +CONFIG_ACPI_WMI=m CONFIG_ACPI_ASUS=m # CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -244,6 +247,7 @@ CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m +CONFIG_DELL_WMI=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -290,6 +294,7 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m CONFIG_IOMMU_API=y CONFIG_DMAR=y # CONFIG_DMAR_DEFAULT_ON is not set @@ -298,6 +303,9 @@ CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set @@ -635,8 +643,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -770,31 +776,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -802,6 +798,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -1108,9 +1106,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m -CONFIG_SCSI_ISCSI2_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_ISCSI1_ATTRS is not set +# CONFIG_SCSI_ISCSI2_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1122,10 +1120,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1179,11 +1178,13 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m +# CONFIG_SCSI_QLA_ISCSI is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1192,6 +1193,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1290,7 +1292,7 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=256 +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m CONFIG_FUSION_LOGGING=y @@ -1428,6 +1430,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1446,13 +1449,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1463,6 +1471,8 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y # # Token Ring devices @@ -1476,6 +1486,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1526,6 +1537,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1542,41 +1554,33 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1784,6 +1788,7 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -2086,27 +2091,34 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -2118,21 +2130,31 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2373,6 +2395,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2610,6 +2633,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2682,32 +2706,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2721,9 +2720,11 @@ CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5400=m CONFIG_EDAC_K8=m +CONFIG_EDAC_AMD64=m CONFIG_EDAC_POLL=y # @@ -2810,6 +2811,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -3038,6 +3040,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -3078,7 +3083,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3164,7 +3169,6 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y 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 cabbce0..13d35ca 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 -# Thu Nov 5 09:02:58 2009 +# Fri May 28 00:51:35 2010 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -64,6 +64,7 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_VM_EVENT_COUNTERS=y @@ -138,8 +139,8 @@ CONFIG_MTRR=y CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_PREEMPT_NOTIFIERS=y @@ -232,9 +233,11 @@ CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_NUMA=y +CONFIG_ACPI_WMI=m CONFIG_ACPI_ASUS=m # CONFIG_ACPI_IBM is not set CONFIG_ACPI_TOSHIBA=m +CONFIG_ACPI_POWER_METER=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y @@ -244,6 +247,7 @@ CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m +CONFIG_DELL_WMI=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y @@ -290,6 +294,7 @@ CONFIG_PCI_MMCONFIG=y CONFIG_VIRTIO=m CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m CONFIG_IOMMU_API=y CONFIG_DMAR=y # CONFIG_DMAR_DEFAULT_ON is not set @@ -298,6 +303,9 @@ CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m CONFIG_PCI_DOMAINS=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set @@ -635,8 +643,6 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set # # TIPC Configuration (EXPERIMENTAL) @@ -770,31 +776,21 @@ CONFIG_FIB_RULES=y # Wireless # CONFIG_CFG80211=m -CONFIG_NL80211=y +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_WIRELESS_EXT=y -CONFIG_NET_WIRELESS_RTNETLINK=y +CONFIG_WIRELESS_COMPAT=m CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_NONE is not set - -# -# Selecting 'y' for an algorithm will -# - -# -# build the algorithm into mac80211. -# -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel" # CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set -# CONFIG_MAC80211_DEBUG is not set +# CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m @@ -802,6 +798,8 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y # # Device Drivers @@ -1108,9 +1106,9 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_ISCSI1_ATTRS=m -CONFIG_SCSI_ISCSI2_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_ISCSI1_ATTRS is not set +# CONFIG_SCSI_ISCSI2_ATTRS is not set CONFIG_SCSI_SAS_ATTRS=m CONFIG_SCSI_SAS_LIBSAS=m CONFIG_SCSI_SAS_ATA=y @@ -1122,10 +1120,11 @@ CONFIG_SCSI_SAS_ATA=y CONFIG_LIBFC=m CONFIG_LIBFCOE=m CONFIG_FCOE=m -CONFIG_LIBISCSI1=m -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_LIBISCSI1 is not set +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m @@ -1179,11 +1178,13 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m +# CONFIG_SCSI_QLA_ISCSI is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_PMCRAID=m # # PCMCIA SCSI adapter support @@ -1192,6 +1193,7 @@ CONFIG_SCSI_DC395x=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set CONFIG_SCSI_DH=m +CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_ALUA=m CONFIG_ATA=m @@ -1290,7 +1292,7 @@ CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=256 +CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m CONFIG_FUSION_LAN=m CONFIG_FUSION_LOGGING=y @@ -1428,6 +1430,7 @@ CONFIG_E1000_NAPI=y CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IGBVF=m +CONFIG_IGB_DCA=y CONFIG_NS83820=m # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1446,13 +1449,18 @@ CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) # +CONFIG_MDIO=m CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T3=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m CONFIG_IXGB=m CONFIG_IXGB_NAPI=y CONFIG_S2IO=m CONFIG_S2IO_NAPI=y +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_ENIC=m CONFIG_NETXEN_NIC=m @@ -1463,6 +1471,8 @@ CONFIG_QLGE=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_BE2NET=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y # # Token Ring devices @@ -1476,6 +1486,7 @@ CONFIG_3C359=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1526,6 +1537,7 @@ CONFIG_PRISM54=m CONFIG_USB_ZD1201=m CONFIG_RTL8180=m CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1542,41 +1554,33 @@ CONFIG_BCM43XX_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_NET_WIRELESS=y +CONFIG_ATH_COMMON=m CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set +CONFIG_ATH9K=m +# CONFIG_ATH9K_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m -CONFIG_IWLWIFI_LEDS=y -# CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_LEDS is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -CONFIG_IWLAGN_LEDS=y CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -# CONFIG_IWL3945_RFKILL is not set CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2400PCI=m -# CONFIG_RT2400PCI_RFKILL is not set -# CONFIG_RT2400PCI_LEDS is not set CONFIG_RT2500PCI=m -# CONFIG_RT2500PCI_RFKILL is not set -# CONFIG_RT2500PCI_LEDS is not set CONFIG_RT61PCI=m -# CONFIG_RT61PCI_RFKILL is not set -# CONFIG_RT61PCI_LEDS is not set CONFIG_RT2500USB=m -# CONFIG_RT2500USB_LEDS is not set CONFIG_RT73USB=m -# CONFIG_RT73USB_LEDS is not set +# CONFIG_RT2800USB is not set +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1784,6 +1788,7 @@ CONFIG_ISDN_DRV_AVMB1_C4=m # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_POLLDEV=m # # Userland interfaces @@ -2086,27 +2091,34 @@ CONFIG_SENSORS_MAX6875=m # Dallas's 1-wire bus # # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# CONFIG_HWMON=m CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7418=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -2118,21 +2130,31 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -2373,6 +2395,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_CS4281=m CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m CONFIG_SND_DARLA20=m CONFIG_SND_GINA20=m CONFIG_SND_LAYLA20=m @@ -2610,6 +2633,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y @@ -2682,32 +2706,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 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=y -CONFIG_INFINIBAND_SDP_DEBUG_DATA=y -CONFIG_INFINIBAND_QLGC_VNIC=m -# CONFIG_INFINIBAND_QLGC_VNIC_STATS is not set -CONFIG_INFINIBAND_MADEYE=m +# CONFIG_INFINIBAND is not set # # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) @@ -2721,9 +2720,11 @@ CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m CONFIG_EDAC_I5000=m CONFIG_EDAC_I5400=m CONFIG_EDAC_K8=m +CONFIG_EDAC_AMD64=m CONFIG_EDAC_POLL=y # @@ -2810,6 +2811,7 @@ CONFIG_EXT4DEV_COMPAT=y CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_DEBUG=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m @@ -3038,6 +3040,9 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=17 CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -3078,7 +3083,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set # CONFIG_SECURITY_SECLVL is not set -CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 @@ -3164,7 +3169,6 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y diff --git a/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch index 2a69694..0754e9c 100644 --- a/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch +++ b/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch @@ -7,20 +7,11 @@ Index: linux-2.6/kernel/sched.c =================================================================== --- linux-2.6.orig/kernel/sched.c 2006-07-15 11:51:46.000000000 +0800 +++ linux-2.6/kernel/sched.c 2006-07-15 16:24:35.000000000 +0800 -@@ -4652,7 +4652,7 @@ static inline struct task_struct *younge - - static const char stat_nam[] = "RSDTtZX"; - --static void show_task(struct task_struct *p) -+void show_task(struct task_struct *p) - { - struct task_struct *relative; - unsigned long free = 0; @@ -4698,6 +4698,7 @@ static void show_task(struct task_struct show_stack(p, NULL); } -+EXPORT_SYMBOL(show_task); ++EXPORT_SYMBOL(sched_show_task); void show_state(void) { diff --git a/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch b/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch index f4eb3b9..52da835e 100644 --- a/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch +++ b/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch @@ -174,7 +174,7 @@ diff -pur b/drivers/md/raid5.c a/drivers/md/raid5.c release_stripe(sh); return STRIPE_SECTORS; -@@ -3091,9 +3128,11 @@ static void raid5d (mddev_t *mddev) +@@ -3091,7 +3128,7 @@ static void raid5d (mddev_t *mddev) handled++; atomic_inc(&conf->handled_in_raid5d); @@ -182,8 +182,4 @@ diff -pur b/drivers/md/raid5.c a/drivers/md/raid5.c + handle_stripe(sh, conf->spare_page, NULL); release_stripe(sh); -+ cond_resched(); -+ - spin_lock_irq(&conf->device_lock); - } - PRINTK("%d stripes handled\n", handled); + cond_resched(); diff --git a/lustre/kernel_patches/patches/raid5-stats-rhel5.patch b/lustre/kernel_patches/patches/raid5-stats-rhel5.patch index d1e43d6..b119334 100644 --- a/lustre/kernel_patches/patches/raid5-stats-rhel5.patch +++ b/lustre/kernel_patches/patches/raid5-stats-rhel5.patch @@ -77,9 +77,9 @@ diff -pru linux-2.6.18-53.orig/drivers/md/raid5.c linux-2.6.18-53/drivers/md/rai set_bit(STRIPE_DELAYED, &sh->state); set_bit(STRIPE_HANDLE, &sh->state); @@ -1870,6 +1885,7 @@ static void handle_stripe5(struct stripe - bi->bi_next = NULL; - bi->bi_size = 0; - bi->bi_end_io(bi, bytes, 0); + bi->bi_end_io(bi, bytes, + test_bit(BIO_UPTODATE, &bi->bi_flags) + ? 0 : -EIO); + atomic_dec(&conf->in_reqs_in_queue); } for (i=disks; i-- ;) { @@ -126,9 +126,9 @@ diff -pru linux-2.6.18-53.orig/drivers/md/raid5.c linux-2.6.18-53/drivers/md/rai PRINTK("Request delayed stripe %llu block %d for Reconstruct\n", (unsigned long long)sh->sector, i); @@ -2423,6 +2446,7 @@ static void handle_stripe6(struct stripe - bi->bi_next = NULL; - bi->bi_size = 0; - bi->bi_end_io(bi, bytes, 0); + bi->bi_end_io(bi, bytes, + test_bit(BIO_UPTODATE, &bi->bi_flags) + ? 0 : -EIO); + atomic_dec(&conf->in_reqs_in_queue); } for (i=disks; i-- ;) { diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series index c6dccfe..c847422 100644 --- a/lustre/kernel_patches/series/2.6-rhel5.series +++ b/lustre/kernel_patches/series/2.6-rhel5.series @@ -1,6 +1,5 @@ lustre_version.patch vfs_races-2.6-rhel5.patch -i_filter_data.patch jbd-jcberr-2.6.18-vanilla.patch export_symbols-2.6.12.patch dev_read_only-2.6.18-vanilla.patch @@ -21,7 +20,6 @@ jbd-journal-chksum-2.6.18-vanilla.patch quota-large-limits-rhel5.patch raid5-mmp-unplug-dev.patch small-fixes-about-jbd.patch -jbd-slab-race-2.6-rhel5.patch mpt-fusion-max-sge.patch prune-icache-use-trylock-rhel5.patch jbd2-jcberr-2.6-rhel5.patch diff --git a/lustre/kernel_patches/targets/2.6-oel5.target.in b/lustre/kernel_patches/targets/2.6-oel5.target.in index 6cbd050..4f45402 100644 --- a/lustre/kernel_patches/targets/2.6-oel5.target.in +++ b/lustre/kernel_patches/targets/2.6-oel5.target.in @@ -1,12 +1,12 @@ lnxmaj="2.6.18" -lnxrel="164.11.1.0.1.el5" +lnxrel="194.11.3.0.1.el5" KERNEL_SRPM=kernel-$lnxmaj-$lnxrel.src.rpm SERIES=2.6-rhel5.series EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ LUSTRE_VERSION=@VERSION@ -OFED_VERSION=inkernel +OFED_VERSION=1.5.1 RDAC_VERSION="09.03.0C02.0013" MPTLINUX_VERSION="4.18.20.04" diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index e38bcfb..6e5d965 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -1,11 +1,12 @@ lnxmaj="2.6.18" -lnxrel="164.11.1.el5" +lnxrel="194.11.3.el5" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel5.series EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ LUSTRE_VERSION=@VERSION@ +OFED_VERSION=inkernel RDAC_VERSION="09.03.0C02.0013" MPTLINUX_VERSION="4.18.20.04" diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index b8d6f1e..30e94fc 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,11 +1,11 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel5 RHEL5: 2.6.18-164.11.1.el5 -2.6-rhel5 OEL5: 2.6.18-164.11.1.0.1.el5 +2.6-rhel5 RHEL5: 2.6.18-194.11.3.el5 +2.6-rhel5 OEL5: 2.6.18-194.11.3.0.1.el5 CLIENT SUPPORT FOR UNPATCHED KERNELS: - 2.6.18-164.11.1.el5 (RHEL 5), - 2.6.18-164.11.1.0.1.el5 (OEL 5) + 2.6.18-194.11.3.el5 (RHEL 5), + 2.6.18-194.11.3.0.1.el5 (OEL 5) 2.6.16.60-0.42.8 (SLES 10), 2.6.27.19-5 (SLES11) diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c index d2e4c18..a93b88b 100644 --- a/lustre/lvfs/fsfilt_ext3.c +++ b/lustre/lvfs/fsfilt_ext3.c @@ -82,13 +82,11 @@ extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *, #include #include -#ifdef EXT3_MULTIBLOCK_ALLOCATOR #ifdef HAVE_EXT4_LDISKFS #include #else #include #endif -#endif #include "lustre_quota_fmt.h" @@ -107,6 +105,15 @@ extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *, #define FSFILT_SINGLEDATA_TRANS_BLOCKS(sb) EXT3_SINGLEDATA_TRANS_BLOCKS #endif +#ifdef EXT_INSERT_EXTENT_WITH_5ARGS +#define fsfilt_ext3_ext_insert_extent(handle, inode, path, newext, flag) \ + ext3_ext_insert_extent(handle, inode, path, newext, flag) +#else +#define fsfilt_ext3_ext_insert_extent(handle, inode, path, newext, flag) \ + ext3_ext_insert_extent(handle, inode, path, newext) +#endif + + static cfs_mem_cache_t *fcb_cache; struct fsfilt_cb_data { @@ -817,15 +824,10 @@ static int fsfilt_ext3_sync(struct super_block *sb) return ext3_force_commit(sb); } -#if defined(EXT3_MULTIBLOCK_ALLOCATOR) && (!defined(EXT3_EXT_CACHE_NO) || defined(EXT_CACHE_MARK)) -#warning "kernel code has old extents/mballoc patch, disabling" -#undef EXT3_MULTIBLOCK_ALLOCATOR -#endif #ifndef EXT3_EXTENTS_FL #define EXT3_EXTENTS_FL 0x00080000 /* Inode uses extents */ #endif -#ifdef EXT3_MULTIBLOCK_ALLOCATOR #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)) #define fsfilt_up_truncate_sem(inode) up(&EXT3_I(inode)->truncate_sem); #define fsfilt_down_truncate_sem(inode) down(&EXT3_I(inode)->truncate_sem); @@ -1037,7 +1039,7 @@ static int ext3_ext_new_extent_cb(struct ext3_ext_base *base, nex.ee_block = cpu_to_le32(cex->ec_block); ext3_ext_store_pblock(&nex, pblock); nex.ee_len = cpu_to_le16(count); - err = ext3_ext_insert_extent(handle, base, path, &nex); + err = fsfilt_ext3_ext_insert_extent(handle, base, path, &nex, 0); if (err) { /* free data blocks we just allocated */ /* not a good idea to call discard here directly, @@ -1184,7 +1186,6 @@ int fsfilt_ext3_map_ext_inode_pages(struct inode *inode, struct page **page, cleanup: return rc; } -#endif /* EXT3_MULTIBLOCK_ALLOCATOR */ extern int ext3_map_inode_page(struct inode *inode, struct page *page, unsigned long *blocks, int *created, int create); @@ -1216,13 +1217,12 @@ int fsfilt_ext3_map_inode_pages(struct inode *inode, struct page **page, cfs_semaphore_t *optional_sem) { int rc; -#ifdef EXT3_MULTIBLOCK_ALLOCATOR + if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL) { rc = fsfilt_ext3_map_ext_inode_pages(inode, page, pages, blocks, created, create); return rc; } -#endif if (optional_sem != NULL) cfs_down(optional_sem); rc = fsfilt_ext3_map_bm_inode_pages(inode, page, pages, blocks, diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index c036325..75a1c3b 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -6178,6 +6178,7 @@ set_dir_limits () { devs=$(do_node $node "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }') for dev in $devs; do mntdev=$(do_node $node "lctl get_param -n osd*.$dev.mntdev") + do_node $node "test -e $LDPROC/\\\$(basename $mntdev)/max_dir_size" || LDPROC=/sys/fs/ldiskfs do_node $node "echo $1 >$LDPROC/\\\$(basename $mntdev)/max_dir_size" done done