From 63fb7a1d78ae5257127d4e6c4b00a38b84e849ef Mon Sep 17 00:00:00 2001 From: yangsheng Date: Fri, 20 Aug 2010 04:37:50 +0400 Subject: [PATCH] b=13585 Remove i_filterdata patches. i=adilger --- .../kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch | 4 ++-- ldiskfs/kernel_patches/patches/ext4-lustre-i_version.patch | 4 ++-- ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series | 1 - ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch index c7f3c44..4bc112d 100644 --- a/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch +++ b/ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch @@ -118,9 +118,9 @@ Index: linux-2.6.18/include/linux/ext3_fs_i.h typedef int ext3_grpblk_t; @@ -162,6 +164,8 @@ struct ext3_inode_info { + /* mballoc */ + struct list_head i_prealloc_list; spinlock_t i_prealloc_lock; - - void *i_filterdata; + + __u64 i_fs_version; }; diff --git a/ldiskfs/kernel_patches/patches/ext4-lustre-i_version.patch b/ldiskfs/kernel_patches/patches/ext4-lustre-i_version.patch index c78c2e0..7c94e98 100644 --- a/ldiskfs/kernel_patches/patches/ext4-lustre-i_version.patch +++ b/ldiskfs/kernel_patches/patches/ext4-lustre-i_version.patch @@ -12,9 +12,9 @@ Index: linux-2.6.27.21-0.1/fs/ext4/ext4_i.h * storage for cached extent */ @@ -138,6 +140,8 @@ struct ext4_inode_info { - spinlock_t i_block_reservation_lock; + __u16 i_extra_isize; - void *i_filterdata; + spinlock_t i_block_reservation_lock; + + __u64 i_fs_version; }; diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series index a25cb4d..9f1a9fd0 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series @@ -9,7 +9,6 @@ ext3-mballoc3-core.patch ext3-mballoc3-2.6.18.patch ext3-nlinks-2.6-rhel5.patch ext3-remove-cond_resched-calls-2.6.12.patch -ext3-filterdata-sles10.patch ext3-uninit-2.6.18.patch ext3-nanosecond-2.6.18-vanilla.patch ext3-inode-version-2.6.18-vanilla.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series index 7dad980..97a7219 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series @@ -4,7 +4,6 @@ ext4-map_inode_page-sles11.patch export-ext4-2.6-sles11.patch ext4-include-fixes-2.6-sles11.patch ext4-remove-cond_resched-calls-sles11.patch -ext4-filterdata-sles11.patch ext4-mmp-sles11.patch ext4-fiemap-2.6-sles11.patch ext4-lookup-dotdot-sles11.patch -- 1.8.3.1