From db107f9e83cc679d249ba069ade3db0d686e9618 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Fri, 20 Feb 2009 14:33:07 +0000 Subject: [PATCH] Branch HEAD b=18289 i=shadow, johann, yibin.wang Update kernel for RHEL5.3 2.6.18-128.1.1. Enable the in-kernel OFED because out tree OFED package hasn't provide support for RHEL5.3. --- .../patches/ext3-extents-2.6.18-vanilla.patch | 24 +++++++++++----------- .../patches/ext3-uninit-2.6.18.patch | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch index f19b76e..4e900bf 100644 --- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch @@ -2337,20 +2337,20 @@ Index: linux-2.6.18.8/fs/ext3/inode.c depth = ext3_block_to_path(inode,iblock,offsets,&blocks_to_boundary); @@ -984,12 +983,10 @@ static int ext3_get_block(struct inode * + started = 1; + } - get_block: - if (ret == 0) { -- ret = ext3_get_blocks_handle(handle, inode, iblock, -+ ret = ext3_get_blocks_wrap(handle, inode, iblock, +- ret = ext3_get_blocks_handle(handle, inode, iblock, ++ ret = ext3_get_blocks_wrap(handle, inode, iblock, max_blocks, bh_result, create, 0); -- if (ret > 0) { -- bh_result->b_size = (ret << inode->i_blkbits); -+ if (ret > 0) - ret = 0; -- } - } - return ret; - } +- if (ret > 0) { +- bh_result->b_size = (ret << inode->i_blkbits); ++ if (ret > 0) + ret = 0; +- } + if (started) + ext3_journal_stop(handle); + out: @@ -1008,7 +1005,7 @@ struct buffer_head *ext3_getblk(handle_t dummy.b_state = 0; dummy.b_blocknr = -1000; diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch index 0a463dc..d2aad2a 100644 --- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch +++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch @@ -88,9 +88,9 @@ Index: linux-2.6.18-53.1.19/fs/ext3/resize.c -} - -/* - * Set up the block and inode bitmaps, and the inode table for the new group. - * This doesn't need to be part of the main transaction, since we are only - * changing blocks outside the actual filesystem. We still do journaling to + * If we have fewer than thresh credits, extend by EXT3_MAX_TRANS_DATA. + * If that fails, restart the transaction & regain write access for the + * buffer head which is used for block_bitmap modifications. @@ -834,6 +816,7 @@ int ext3_group_add(struct super_block *s gdp->bg_inode_table = cpu_to_le32(input->inode_table); gdp->bg_free_blocks_count = cpu_to_le16(input->free_blocks_count); -- 1.8.3.1