From b62386b4056b5da98351e16ac3d58be5bf17e735 Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 18 Jun 2004 01:03:17 +0000 Subject: [PATCH] Remove the ext3-trusted-ea patch from the chaos series. This is already in the RHEL kernel, and the changes that were lingering from the old trusted EA patch only served to screw things up. --- .../patches/ext3-trusted_ea-2.4.21-chaos.patch | 97 ---------------------- lustre/kernel_patches/series/chaos-2.4.21 | 1 - 2 files changed, 98 deletions(-) delete mode 100644 lustre/kernel_patches/patches/ext3-trusted_ea-2.4.21-chaos.patch diff --git a/lustre/kernel_patches/patches/ext3-trusted_ea-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-trusted_ea-2.4.21-chaos.patch deleted file mode 100644 index 1a7df92..0000000 --- a/lustre/kernel_patches/patches/ext3-trusted_ea-2.4.21-chaos.patch +++ /dev/null @@ -1,97 +0,0 @@ - fs/ext3/xattr.c | 12 +++++- - fs/ext3/xattr_trusted.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ - include/linux/ext3_xattr.h | 6 +++ - 3 files changed, 102 insertions(+), 2 deletions(-) - -Index: linux-2.4.21/fs/ext3/Makefile -=================================================================== ---- linux-2.4.21.orig/fs/ext3/Makefile 2004-06-16 14:52:07.000000000 -0600 -+++ linux-2.4.21/fs/ext3/Makefile 2004-06-16 14:52:08.000000000 -0600 -@@ -12,7 +12,8 @@ O_TARGET := ext3.o - export-objs := ext3-exports.o - - obj-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 ext3-exports.o -+ ioctl.o namei.o super.o symlink.o hash.o ext3-exports.o \ -+ xattr_trusted.o - obj-m := $(O_TARGET) - - export-objs += xattr.o -Index: linux-2.4.21/fs/ext3/xattr.c -=================================================================== ---- linux-2.4.21.orig/fs/ext3/xattr.c 2004-06-16 14:52:08.000000000 -0600 -+++ linux-2.4.21/fs/ext3/xattr.c 2004-06-16 15:47:06.000000000 -0600 -@@ -1780,18 +1780,25 @@ static void ext3_xattr_rehash(struct ext - int __init - init_ext3_xattr(void) - { -+ int error; -+ - ext3_xattr_cache = mb_cache_create("ext3_xattr", NULL, - sizeof(struct mb_cache_entry) + - sizeof(struct mb_cache_entry_index), 1, 61); - if (!ext3_xattr_cache) - return -ENOMEM; - -- return 0; -+ error = init_ext3_xattr_trusted(); -+ if (error) -+ mb_cache_destroy(ext3_xattr_cache); -+ -+ return error; - } - - void - exit_ext3_xattr(void) - { -+ exit_ext3_xattr_trusted(); - if (ext3_xattr_cache) - mb_cache_destroy(ext3_xattr_cache); - ext3_xattr_cache = NULL; -@@ -1802,12 +1809,13 @@ exit_ext3_xattr(void) - int __init - init_ext3_xattr(void) - { -- return 0; -+ return init_ext3_xattr_trusted(); - } - - void - exit_ext3_xattr(void) - { -+ exit_ext3_xattr_trusted(); - } - - #endif /* CONFIG_EXT3_FS_XATTR_SHARING */ -Index: linux-2.4.21/fs/ext3/xattr_trusted.c -=================================================================== ---- linux-2.4.21.orig/fs/ext3/xattr_trusted.c 2004-06-16 14:52:06.000000000 -0600 -+++ linux-2.4.21/fs/ext3/xattr_trusted.c 2004-06-16 15:36:26.000000000 -0600 -@@ -2,10 +2,11 @@ - * linux/fs/ext3/xattr_trusted.c - * Handler for trusted extended attributes. - * -- * Copyright (C) 2001 by Andreas Gruenbacher, -+ * Copyright (C) 2003 by Andreas Gruenbacher, - */ - --#include -+#include -+#include - #include - #include - #include -Index: linux-2.4.21/include/linux/ext3_xattr.h -=================================================================== ---- linux-2.4.21.orig/include/linux/ext3_xattr.h 2004-06-16 14:52:06.000000000 -0600 -+++ linux-2.4.21/include/linux/ext3_xattr.h 2004-06-16 14:52:08.000000000 -0600 -@@ -93,6 +93,9 @@ extern void ext3_xattr_put_super(struct - extern int init_ext3_xattr(void) __init; - extern void exit_ext3_xattr(void); - -+extern int init_ext3_xattr_trusted(void) __init; -+extern void exit_ext3_xattr_trusted(void); -+ - # else /* CONFIG_EXT3_FS_XATTR */ - # define ext3_setxattr NULL - # define ext3_getxattr NULL diff --git a/lustre/kernel_patches/series/chaos-2.4.21 b/lustre/kernel_patches/series/chaos-2.4.21 index b3e932f..c70c22e 100644 --- a/lustre/kernel_patches/series/chaos-2.4.21 +++ b/lustre/kernel_patches/series/chaos-2.4.21 @@ -27,7 +27,6 @@ add_page_private.patch ext3-raw-lookup.patch nfs_export_kernel-2.4.21-chaos.patch ext3-ea-in-inode-2.4.21-chaos.patch -ext3-trusted_ea-2.4.21-chaos.patch listman-2.4.21-chaos.patch gfp_memalloc-2.4.21-chaos.patch ext3-xattr-ptr-arith-fix.patch -- 1.8.3.1