Permalink
Browse files

LU-723 ldiskfs: remove ext3 RHEL5 kernel series

Remove the old ext3 RHEL5 kernel patch series.  This has been
deprecated since Lustre 1.8.6 in favour of the ext4 RHEL5 series.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I1e09ff432f2e970446c3b43fb92f0c1a988159ae
Reviewed-on: http://review.whamcloud.com/1603
Tested-by: Hudson
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
  • Loading branch information...
1 parent fd21a6c commit a16cc282ea41d887be28e0fb32dad4753e013a32 Andreas Dilger committed with morrone Oct 26, 2011
Showing with 7 additions and 14,763 deletions.
  1. +0 −1 build/autoconf/lustre-build-linux.m4
  2. +7 −18 ldiskfs/configure.ac
  3. +0 −99 ldiskfs/kernel_patches/patches/alloc-policy-2.6-rhlel5.diff
  4. +0 −35 ldiskfs/kernel_patches/patches/export-ext3-2.6-rhel4.patch
  5. +0 −56 ldiskfs/kernel_patches/patches/ext3-big-endian-check-2.6-rhel5.patch
  6. +0 −169 ldiskfs/kernel_patches/patches/ext3-block-bitmap-validation-2.6-rhel5.patch
  7. +0 −145 ldiskfs/kernel_patches/patches/ext3-corrupted-orphans-2.6.patch
  8. +0 −153 ldiskfs/kernel_patches/patches/ext3-disable-mb-cache.patch
  9. +0 −33 ldiskfs/kernel_patches/patches/ext3-dynlocks-2.6-rhel5.patch
  10. +0 −278 ldiskfs/kernel_patches/patches/ext3-dynlocks-common.patch
  11. +0 −27 ldiskfs/kernel_patches/patches/ext3-ea-expand-lose-block.patch
  12. +0 −135 ldiskfs/kernel_patches/patches/ext3-export-64bit-name-hash.patch
  13. +0 −2,903 ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
  14. +0 −96 ldiskfs/kernel_patches/patches/ext3-fiemap-2.6-rhel5.patch
  15. +0 −57 ldiskfs/kernel_patches/patches/ext3-force_over_8tb-rhel5.patch
  16. +0 −49 ldiskfs/kernel_patches/patches/ext3-get-raid-stripe-from-sb.patch
  17. +0 −87 ldiskfs/kernel_patches/patches/ext3-hash-indexed-dir-dotdot-update.patch
  18. +0 −53 ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-rhel4.patch
  19. +0 −466 ldiskfs/kernel_patches/patches/ext3-inode-version-2.6.18-vanilla.patch
  20. +0 −81 ldiskfs/kernel_patches/patches/ext3-journal-chksum-2.6.18-vanilla.patch
  21. +0 −232 ldiskfs/kernel_patches/patches/ext3-kill-dx_root.patch
  22. +0 −43 ldiskfs/kernel_patches/patches/ext3-lookup-dotdot-2.6.9.patch
  23. +0 −86 ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6.18.patch
  24. +0 −179 ldiskfs/kernel_patches/patches/ext3-max-dir-size.patch
  25. +0 −150 ldiskfs/kernel_patches/patches/ext3-mballoc-pa_free-mismatch.patch
  26. +0 −608 ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.18.patch
  27. +0 −4,777 ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch
  28. +0 −593 ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
  29. +0 −405 ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6.18-vanilla.patch
  30. +0 −158 ldiskfs/kernel_patches/patches/ext3-nlinks-2.6-rhel5.patch
  31. +0 −65 ldiskfs/kernel_patches/patches/ext3-osd-iam-exports.patch
  32. +0 −228 ldiskfs/kernel_patches/patches/ext3-osd-iop-common.patch
  33. +0 −68 ldiskfs/kernel_patches/patches/ext3-pdir-fix.patch
  34. +0 −16 ldiskfs/kernel_patches/patches/ext3-print-inum-in-htree-warning.patch
  35. +0 −29 ldiskfs/kernel_patches/patches/ext3-remove-cond_resched-calls-2.6.12.patch
  36. +0 −70 ldiskfs/kernel_patches/patches/ext3-statfs-2.6-rhel5.patch
  37. +0 −699 ldiskfs/kernel_patches/patches/ext3-uninit-2.6.18.patch
  38. +0 −19 ldiskfs/kernel_patches/patches/ext3-version-2.6-rhel5.patch
  39. +0 −205 ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-rhel4.patch
  40. +0 −32 ldiskfs/kernel_patches/patches/ext3-xattr-no-update-ctime-2.6.22-vanilla.patch
  41. +0 −539 ldiskfs/kernel_patches/patches/ext3_data_in_dirent.patch
  42. +0 −62 ldiskfs/kernel_patches/patches/ext3_fix_i_flags.patch
  43. +0 −519 ldiskfs/kernel_patches/patches/ext4-convert-group-lock-rhel5.patch
  44. +0 −40 ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
@@ -116,7 +116,6 @@ LB_LINUX_TRY_COMPILE([
#error "not redhat kernel"
#endif
],[
- RHEL_KENEL="yes"
RHEL_KERNEL="yes"
AC_MSG_RESULT([yes])
],[
View
@@ -116,27 +116,16 @@ if test x$enable_dist != xyes; then
# don't need to do this if only configuring for make dist
AC_MSG_CHECKING([which ldiskfs series to use])
case $LINUXRELEASE in
-2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;
-2.6.9*) LDISKFS_SERIES="2.6-rhel4.series" ;;
-2.6.10-ac*) LDISKFS_SERIES="2.6-fc3.series" ;;
-2.6.10*) LDISKFS_SERIES="2.6-rhel4.series" ;;
-2.6.12*) LDISKFS_SERIES="2.6.12-vanilla.series" ;;
-2.6.15*) LDISKFS_SERIES="2.6-fc5.series";;
-2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
2.6.18*)
- if test x$RHEL_KENEL = xyes; then
- if test x$enable_ext4 = xyes; then
- LDISKFS_SERIES="2.6-rhel5-ext4.series"
- else
- LDISKFS_SERIES="2.6-rhel5.series"
- fi
- else
- LDISKFS_SERIES="2.6.18-vanilla.series"
+ if test x$RHEL_KERNEL = xyes; then
+ LDISKFS_SERIES="2.6-rhel5-ext4.series"
+ fi
+ ;;
+2.6.32*)
+ if test x$RHEL_KERNEL = xyes; then
+ LDISKFS_SERIES="2.6-rhel6.series"
fi
;;
-2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
-2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
-2.6.32*) LDISKFS_SERIES="2.6-rhel6.series";;
*) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
esac
AC_MSG_RESULT([$LDISKFS_SERIES])
@@ -1,99 +0,0 @@
-diff -Nrpu /tmp/linux-stage/fs/ext3/ialloc.c linux-stage/fs/ext3/ialloc.c
---- /tmp/linux-stage/fs/ext3/ialloc.c 2009-05-09 06:44:02.000000000 +0400
-+++ linux-stage/fs/ext3/ialloc.c 2009-05-09 06:45:33.000000000 +0400
-@@ -822,6 +822,36 @@ fail_drop:
- return ERR_PTR(err);
- }
-
-+unsigned long ext3_find_reverse(struct super_block *sb)
-+{
-+ struct ext3_group_desc *desc;
-+ struct buffer_head *bitmap_bh = NULL;
-+ int group;
-+ unsigned long ino, offset;
-+
-+ for (offset = (EXT3_INODES_PER_GROUP(sb) >> 1); offset >= 0;
-+ offset >>= 1) {
-+ for (group = EXT3_SB(sb)->s_groups_count - 1; group >= 0;
-+ --group) {
-+ desc = ext3_get_group_desc(sb, group, NULL);
-+ if (desc->bg_free_inodes_count == 0)
-+ continue;
-+
-+ bitmap_bh = read_inode_bitmap(sb, group);
-+ if (!bitmap_bh)
-+ continue;
-+
-+ ino = ext3_find_next_zero_bit((unsigned long *)
-+ bitmap_bh->b_data,
-+ EXT3_INODES_PER_GROUP(sb), offset);
-+ if (ino < EXT3_INODES_PER_GROUP(sb))
-+ return(group * EXT3_INODES_PER_GROUP(sb) +
-+ ino + 1);
-+ }
-+ }
-+ return 0;
-+}
-+
- /* Verify that we are loading a valid orphan from disk */
- struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino)
- {
-diff -Nrpu /tmp/linux-stage/fs/ext3/namei.c linux-stage/fs/ext3/namei.c
---- /tmp/linux-stage/fs/ext3/namei.c 2009-05-09 06:44:02.000000000 +0400
-+++ linux-stage/fs/ext3/namei.c 2009-05-09 06:45:33.000000000 +0400
-@@ -145,14 +145,25 @@ struct dx_map_entry
- u32 offs;
- };
-
-+/*
-+ * dentry_param used by ext3_new_inode_wantedi()
-+ */
- #define LVFS_DENTRY_PARAM_MAGIC 20070216UL
- struct lvfs_dentry_params
- {
-- unsigned long p_inum;
-- void *p_ptr;
-- u32 magic;
-+ unsigned long ldp_inum;
-+ long ldp_flags;
-+ u32 ldp_magic;
- };
-
-+/* Only use the least 3 bits of ldp_flags for goal policy */
-+typedef enum {
-+ DP_GOAL_POLICY = 0,
-+ DP_LASTGROUP_REVERSE = 1,
-+} dp_policy_t;
-+
-+#define LDP_FLAGS_RANGE 0x07
-+
- #ifdef CONFIG_EXT3_INDEX
- static inline unsigned dx_get_block (struct dx_entry *entry);
- static void dx_set_block (struct dx_entry *entry, unsigned value);
-@@ -1718,8 +1727,13 @@ static struct inode * ext3_new_inode_wan
- if (dentry->d_fsdata != NULL) {
- struct lvfs_dentry_params *param = dentry->d_fsdata;
-
-- if (param->magic == LVFS_DENTRY_PARAM_MAGIC)
-- inum = param->p_inum;
-+ if (param->ldp_magic == LVFS_DENTRY_PARAM_MAGIC) {
-+ if ((dp_policy_t)(param->ldp_flags & LDP_FLAGS_RANGE) ==
-+ DP_LASTGROUP_REVERSE)
-+ inum = ext3_find_reverse(dir->i_sb);
-+ else /* DP_GOAL_POLICY */
-+ inum = param->ldp_inum;
-+ }
- }
- return ext3_new_inode(handle, dir, mode, inum);
- }
-diff -Nrpu /tmp/linux-stage/include/linux/ext3_fs.h linux-stage/include/linux/ext3_fs.h
---- /tmp/linux-stage/include/linux/ext3_fs.h 2009-05-09 06:44:02.000000000 +0400
-+++ linux-stage/include/linux/ext3_fs.h 2009-05-09 06:45:33.000000000 +0400
-@@ -973,6 +973,7 @@ extern int ext3fs_dirhash(const char *na
- /* ialloc.c */
- extern struct inode * ext3_new_inode (handle_t *, struct inode *, int,
- unsigned long);
-+extern unsigned long ext3_find_reverse(struct super_block *);
- extern void ext3_free_inode (handle_t *, struct inode *);
- extern struct inode * ext3_orphan_get (struct super_block *, unsigned long);
- extern unsigned long ext3_count_free_inodes (struct super_block *);
@@ -1,35 +0,0 @@
-Index: linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/super.c
-===================================================================
---- linux-2.6.9-42.0.10.EL_lustre.1.4.10.orig/fs/ext3/super.c 2007-05-16 08:46:24.000000000 +0200
-+++ linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/super.c 2007-05-16 08:48:58.000000000 +0200
-@@ -123,6 +123,8 @@ void ext3_journal_abort_handle(const cha
- journal_abort_handle(handle);
- }
-
-+EXPORT_SYMBOL(ext3_journal_abort_handle);
-+
- /* Deal with the reporting of failure conditions on a filesystem such as
- * inconsistencies detected or read IO failures.
- *
-@@ -2064,6 +2066,8 @@ int ext3_force_commit(struct super_block
- return ret;
- }
-
-+EXPORT_SYMBOL(ext3_force_commit);
-+
- /*
- * Ext3 always journals updates to the superblock itself, so we don't
- * have to propagate any other updates to the superblock on disk at this
-@@ -2586,6 +2590,12 @@ int ext3_map_inode_page(struct inode *in
- unsigned long *blocks, int *created, int create);
- EXPORT_SYMBOL(ext3_map_inode_page);
-
-+EXPORT_SYMBOL(ext3_xattr_get);
-+EXPORT_SYMBOL(ext3_xattr_set_handle);
-+EXPORT_SYMBOL(ext3_bread);
-+EXPORT_SYMBOL(ext3_journal_start_sb);
-+EXPORT_SYMBOL(__ext3_journal_stop);
-+
- MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
- MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
- MODULE_LICENSE("GPL");
@@ -1,56 +0,0 @@
-Index: linux-2.6.18-92.1.6/fs/ext3/super.c
-===================================================================
---- linux-2.6.18-92.1.6.orig/fs/ext3/super.c
-+++ linux-2.6.18-92.1.6/fs/ext3/super.c
-@@ -71,6 +71,8 @@ static void ext3_unlockfs(struct super_b
- static void ext3_write_super (struct super_block * sb);
- static void ext3_write_super_lockfs(struct super_block *sb);
-
-+static int bigendian_extents;
-+
- /*
- * Wrappers for journal_start/end.
- *
-@@ -706,7 +708,7 @@ enum {
- Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
- Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
- Opt_grpquota,
-- Opt_extents, Opt_noextents, Opt_extdebug,
-+ Opt_extents, Opt_noextents, Opt_bigendian_extents, Opt_extdebug,
- Opt_mballoc, Opt_nomballoc, Opt_stripe, Opt_maxdirsize
- };
-
-@@ -766,6 +768,7 @@ static match_table_t tokens = {
- {Opt_barrier, "barrier=%u"},
- {Opt_extents, "extents"},
- {Opt_noextents, "noextents"},
-+ {Opt_bigendian_extents, "bigendian_extents"},
- {Opt_extdebug, "extdebug"},
- {Opt_mballoc, "mballoc"},
- {Opt_nomballoc, "nomballoc"},
-@@ -1129,6 +1132,9 @@ clear_qf_name:
- case Opt_noextents:
- clear_opt (sbi->s_mount_opt, EXTENTS);
- break;
-+ case Opt_bigendian_extents:
-+ bigendian_extents = 1;
-+ break;
- case Opt_extdebug:
- set_opt (sbi->s_mount_opt, EXTDEBUG);
- break;
-@@ -2224,6 +2230,15 @@ static int ext3_fill_super (struct super
- goto failed_mount;
- }
-
-+#ifdef __BIG_ENDIAN
-+ if (bigendian_extents == 0) {
-+ printk(KERN_ERR "EXT3-fs: extents feature is not guaranteed to "
-+ "work on big-endian systems. Use \"bigendian_extents\" "
-+ "mount option to override.\n");
-+ goto failed_mount;
-+ }
-+#endif
-+
- bgl_lock_init(&sbi->s_blockgroup_lock);
-
- sbi->s_last_alloc_group = -1;
Oops, something went wrong.

0 comments on commit a16cc28

Please sign in to comment.