From: braam Date: Tue, 8 Apr 2003 07:18:40 +0000 (+0000) Subject: - fixup xattr patch slightly X-Git-Tag: v1_7_100~1^94~13 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=68cafb769d63d1203bbc82eac4a5e1f25cab9214;p=fs%2Flustre-release.git - fixup xattr patch slightly - put old scripts back, the new ones have some problems --- diff --git a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch index 84223ae..98d95f2 100644 --- a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch +++ b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch @@ -1,70 +1,7 @@ - Documentation/Configure.help | 66 ++ - arch/alpha/defconfig | 7 - arch/alpha/kernel/entry.S | 12 - arch/arm/defconfig | 7 - arch/arm/kernel/calls.S | 24 - arch/i386/defconfig | 7 - arch/ia64/defconfig | 7 - arch/ia64/kernel/entry.S | 24 - arch/m68k/defconfig | 7 - arch/mips/defconfig | 7 - arch/mips64/defconfig | 7 - arch/ppc/defconfig | 14 - arch/ppc64/kernel/misc.S | 2 - arch/s390/defconfig | 7 - arch/s390/kernel/entry.S | 24 - arch/s390x/defconfig | 7 - arch/s390x/kernel/entry.S | 24 - arch/s390x/kernel/wrapper32.S | 92 +++ - arch/sparc/defconfig | 7 - arch/sparc/kernel/systbls.S | 10 - arch/sparc64/defconfig | 7 - arch/sparc64/kernel/systbls.S | 20 - fs/Config.in | 14 - fs/Makefile | 3 - fs/ext2/Makefile | 4 - fs/ext2/file.c | 5 - fs/ext2/ialloc.c | 2 - fs/ext2/inode.c | 34 - - fs/ext2/namei.c | 14 - fs/ext2/super.c | 29 - fs/ext2/symlink.c | 14 - fs/ext2/xattr.c | 1212 +++++++++++++++++++++++++++++++++++++++++ - fs/ext2/xattr_user.c | 103 +++ - fs/ext3/Makefile | 10 - fs/ext3/file.c | 5 - fs/ext3/ialloc.c | 2 - fs/ext3/inode.c | 35 - - fs/ext3/namei.c | 21 - fs/ext3/super.c | 33 + - fs/ext3/symlink.c | 14 - fs/ext3/xattr.c | 1224 ++++++++++++++++++++++++++++++++++++++++++ - fs/ext3/xattr_user.c | 111 +++ - fs/jfs/jfs_xattr.h | 6 - fs/jfs/xattr.c | 6 - fs/mbcache.c | 648 ++++++++++++++++++++++ - include/asm-arm/unistd.h | 2 - include/asm-ia64/unistd.h | 13 - include/asm-ppc64/unistd.h | 2 - include/asm-s390/unistd.h | 15 - include/asm-s390x/unistd.h | 15 - include/asm-sparc/unistd.h | 22 - include/asm-sparc64/unistd.h | 24 - include/linux/cache_def.h | 15 - include/linux/errno.h | 4 - include/linux/ext2_fs.h | 31 - - include/linux/ext2_xattr.h | 157 +++++ - include/linux/ext3_fs.h | 31 - - include/linux/ext3_jbd.h | 8 - include/linux/ext3_xattr.h | 157 +++++ - include/linux/fs.h | 2 - include/linux/mbcache.h | 69 ++ - kernel/ksyms.c | 4 - mm/vmscan.c | 35 + - 63 files changed, 4355 insertions(+), 193 deletions(-) + 0 files changed ---- linux-2.4.20/Documentation/Configure.help~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/Documentation/Configure.help Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/Documentation/Configure.help~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/Documentation/Configure.help 2003-04-08 15:11:04.000000000 +0800 @@ -15242,6 +15242,39 @@ CONFIG_EXT2_FS be compiled as a module, and so this could be dangerous. Most everyone wants to say Y here. @@ -145,8 +82,8 @@ Journal Block Device support (JBD for ext3) (EXPERIMENTAL) CONFIG_JBD This is a generic journalling layer for block devices. It is ---- linux-2.4.20/arch/alpha/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/alpha/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/alpha/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/alpha/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -161,8 +98,8 @@ CONFIG_ALPHA=y # CONFIG_UID16 is not set # CONFIG_RWSEM_GENERIC_SPINLOCK is not set ---- linux-2.4.20/arch/alpha/kernel/entry.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/alpha/kernel/entry.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/alpha/kernel/entry.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/alpha/kernel/entry.S 2003-04-08 15:11:04.000000000 +0800 @@ -1154,6 +1154,18 @@ sys_call_table: .quad sys_readahead .quad sys_ni_syscall /* 380, sys_security */ @@ -182,8 +119,8 @@ /* Remember to update everything, kids. */ .ifne (. - sys_call_table) - (NR_SYSCALLS * 8) ---- linux-2.4.20/arch/arm/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/arm/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/arm/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/arm/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -198,8 +135,8 @@ CONFIG_ARM=y # CONFIG_EISA is not set # CONFIG_SBUS is not set ---- linux-2.4.20/arch/arm/kernel/calls.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/arm/kernel/calls.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/arm/kernel/calls.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/arm/kernel/calls.S 2003-04-08 15:11:04.000000000 +0800 @@ -240,18 +240,18 @@ __syscall_start: .long SYMBOL_NAME(sys_ni_syscall) /* Security */ .long SYMBOL_NAME(sys_gettid) @@ -231,8 +168,8 @@ .long SYMBOL_NAME(sys_tkill) /* * Please check 2.5 _before_ adding calls here, ---- linux-2.4.20/arch/i386/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/i386/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/i386/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/i386/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -247,8 +184,8 @@ CONFIG_X86=y CONFIG_ISA=y # CONFIG_SBUS is not set ---- linux-2.4.20/arch/ia64/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/ia64/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/ia64/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/ia64/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -263,8 +200,8 @@ # # Code maturity level options ---- linux-2.4.20/arch/ia64/kernel/entry.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/ia64/kernel/entry.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/ia64/kernel/entry.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/ia64/kernel/entry.S 2003-04-08 15:11:04.000000000 +0800 @@ -1170,18 +1170,18 @@ sys_call_table: data8 sys_getdents64 data8 sys_getunwind // 1215 @@ -296,8 +233,8 @@ data8 sys_tkill data8 ia64_ni_syscall // 1230 data8 ia64_ni_syscall ---- linux-2.4.20/arch/m68k/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/m68k/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/m68k/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/m68k/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -312,8 +249,8 @@ CONFIG_UID16=y # ---- linux-2.4.20/arch/mips/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/mips/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/mips/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/mips/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -328,8 +265,8 @@ CONFIG_MIPS=y CONFIG_MIPS32=y # CONFIG_MIPS64 is not set ---- linux-2.4.20/arch/mips64/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/mips64/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/mips64/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/mips64/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -344,8 +281,8 @@ CONFIG_MIPS=y # CONFIG_MIPS32 is not set CONFIG_MIPS64=y ---- linux-2.4.20/arch/ppc/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/ppc/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/ppc/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/ppc/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,20 @@ # # Automatically generated make config: don't edit @@ -367,8 +304,8 @@ # CONFIG_UID16 is not set # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y ---- linux-2.4.20/arch/ppc64/kernel/misc.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/ppc64/kernel/misc.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/ppc64/kernel/misc.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/ppc64/kernel/misc.S 2003-04-08 15:11:04.000000000 +0800 @@ -731,6 +731,7 @@ _GLOBAL(sys_call_table32) .llong .sys_gettid /* 207 */ #if 0 /* Reserved syscalls */ @@ -385,8 +322,8 @@ .llong .sys_futex #endif .llong .sys_perfmonctl /* Put this here for now ... */ ---- linux-2.4.20/arch/s390/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/s390/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/s390/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/s390/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -401,8 +338,8 @@ # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_MCA is not set ---- linux-2.4.20/arch/s390/kernel/entry.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/s390/kernel/entry.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/s390/kernel/entry.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/s390/kernel/entry.S 2003-04-08 15:11:04.000000000 +0800 @@ -558,18 +558,18 @@ sys_call_table: .long sys_fcntl64 .long sys_ni_syscall @@ -434,8 +371,8 @@ .long sys_gettid .long sys_tkill .rept 255-237 ---- linux-2.4.20/arch/s390x/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/s390x/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/s390x/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/s390x/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -450,8 +387,8 @@ # CONFIG_ISA is not set # CONFIG_EISA is not set # CONFIG_MCA is not set ---- linux-2.4.20/arch/s390x/kernel/entry.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/s390x/kernel/entry.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/s390x/kernel/entry.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/s390x/kernel/entry.S 2003-04-08 15:11:04.000000000 +0800 @@ -591,18 +591,18 @@ sys_call_table: .long SYSCALL(sys_ni_syscall,sys32_fcntl64_wrapper) .long SYSCALL(sys_ni_syscall,sys_ni_syscall) @@ -483,8 +420,8 @@ .long SYSCALL(sys_gettid,sys_gettid) .long SYSCALL(sys_tkill,sys_tkill) .rept 255-237 ---- linux-2.4.20/arch/s390x/kernel/wrapper32.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/s390x/kernel/wrapper32.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/s390x/kernel/wrapper32.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/s390x/kernel/wrapper32.S 2003-04-08 15:11:04.000000000 +0800 @@ -1091,3 +1091,95 @@ sys32_fstat64_wrapper: llgtr %r3,%r3 # struct stat64 * llgfr %r4,%r4 # long @@ -581,8 +518,8 @@ + jg sys_fremovexattr + + ---- linux-2.4.20/arch/sparc/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/sparc/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/sparc/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/sparc/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -597,8 +534,8 @@ CONFIG_UID16=y CONFIG_HIGHMEM=y ---- linux-2.4.20/arch/sparc/kernel/systbls.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/sparc/kernel/systbls.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/sparc/kernel/systbls.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/sparc/kernel/systbls.S 2003-04-08 15:11:04.000000000 +0800 @@ -51,11 +51,11 @@ sys_call_table: /*150*/ .long sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_getdents64 /*155*/ .long sys_fcntl64, sys_nis_syscall, sys_statfs, sys_fstatfs, sys_oldumount @@ -616,8 +553,8 @@ /*190*/ .long sys_init_module, sys_personality, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall /*195*/ .long sys_nis_syscall, sys_nis_syscall, sys_getppid, sparc_sigaction, sys_sgetmask /*200*/ .long sys_ssetmask, sys_sigsuspend, sys_newlstat, sys_uselib, old_readdir ---- linux-2.4.20/arch/sparc64/defconfig~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/sparc64/defconfig Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/sparc64/defconfig~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/sparc64/defconfig 2003-04-08 15:11:04.000000000 +0800 @@ -1,6 +1,13 @@ # # Automatically generated make config: don't edit @@ -632,8 +569,8 @@ # # Code maturity level options ---- linux-2.4.20/arch/sparc64/kernel/systbls.S~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/arch/sparc64/kernel/systbls.S Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/arch/sparc64/kernel/systbls.S~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/arch/sparc64/kernel/systbls.S 2003-04-08 15:11:04.000000000 +0800 @@ -52,11 +52,11 @@ sys_call_table32: /*150*/ .word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_getdents64 .word sys32_fcntl64, sys_nis_syscall, sys32_statfs, sys32_fstatfs, sys_oldumount @@ -668,8 +605,8 @@ /*190*/ .word sys_init_module, sparc64_personality, sys_nis_syscall, sys_nis_syscall, sys_nis_syscall .word sys_nis_syscall, sys_nis_syscall, sys_getppid, sys_nis_syscall, sys_sgetmask /*200*/ .word sys_ssetmask, sys_nis_syscall, sys_newlstat, sys_uselib, sys_nis_syscall ---- linux-2.4.20/fs/Config.in~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/Config.in Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/Config.in~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/Config.in 2003-04-08 15:11:04.000000000 +0800 @@ -25,6 +25,11 @@ dep_mbool ' Debug Befs' CONFIG_BEFS_DEB dep_tristate 'BFS file system support (EXPERIMENTAL)' CONFIG_BFS_FS $CONFIG_EXPERIMENTAL @@ -705,8 +642,8 @@ mainmenu_option next_comment comment 'Partition Types' source fs/partitions/Config.in ---- linux-2.4.20/fs/Makefile~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/Makefile Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/Makefile~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/Makefile 2003-04-08 15:11:04.000000000 +0800 @@ -79,6 +79,9 @@ obj-y += binfmt_script.o obj-$(CONFIG_BINFMT_ELF) += binfmt_elf.o @@ -717,8 +654,8 @@ # persistent filesystems obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o)) ---- linux-2.4.20/fs/ext2/Makefile~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext2/Makefile Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext2/Makefile~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/Makefile 2003-04-08 15:11:04.000000000 +0800 @@ -13,4 +13,8 @@ obj-y := balloc.o bitmap.o dir.o file ioctl.o namei.o super.o symlink.o obj-m := $(O_TARGET) @@ -728,8 +665,8 @@ +obj-$(CONFIG_EXT2_FS_XATTR_USER) += xattr_user.o + include $(TOPDIR)/Rules.make ---- linux-2.4.20/fs/ext2/file.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext2/file.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext2/file.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/file.c 2003-04-08 15:11:04.000000000 +0800 @@ -20,6 +20,7 @@ #include @@ -747,8 +684,8 @@ + listxattr: ext2_listxattr, + removexattr: ext2_removexattr, }; ---- linux-2.4.20/fs/ext2/ialloc.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext2/ialloc.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext2/ialloc.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/ialloc.c 2003-04-08 15:11:04.000000000 +0800 @@ -15,6 +15,7 @@ #include #include @@ -765,8 +702,8 @@ DQUOT_FREE_INODE(inode); DQUOT_DROP(inode); } ---- linux-2.4.20/fs/ext2/inode.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext2/inode.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext2/inode.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/inode.c 2003-04-08 15:11:04.000000000 +0800 @@ -39,6 +39,18 @@ MODULE_LICENSE("GPL"); static int ext2_update_inode(struct inode * inode, int do_sync); @@ -849,8 +786,8 @@ brelse (bh); inode->i_attr_flags = 0; if (inode->u.ext2_i.i_flags & EXT2_SYNC_FL) { ---- linux-2.4.20/fs/ext2/namei.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext2/namei.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext2/namei.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/namei.c 2003-04-08 15:11:04.000000000 +0800 @@ -31,6 +31,7 @@ #include @@ -884,8 +821,8 @@ + listxattr: ext2_listxattr, + removexattr: ext2_removexattr, }; ---- linux-2.4.20/fs/ext2/super.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext2/super.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext2/super.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/super.c 2003-04-08 15:11:04.000000000 +0800 @@ -21,6 +21,7 @@ #include #include @@ -955,8 +892,8 @@ } EXPORT_NO_SYMBOLS; ---- linux-2.4.20/fs/ext2/symlink.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext2/symlink.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext2/symlink.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:03.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/symlink.c 2003-04-08 15:11:04.000000000 +0800 @@ -19,6 +19,7 @@ #include @@ -986,8 +923,8 @@ + listxattr: ext2_listxattr, + removexattr: ext2_removexattr, }; ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/fs/ext2/xattr.c Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/xattr.c 2003-04-08 15:11:04.000000000 +0800 @@ -0,0 +1,1212 @@ +/* + * linux/fs/ext2/xattr.c @@ -2201,8 +2138,8 @@ +} + +#endif /* CONFIG_EXT2_FS_XATTR_SHARING */ ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/fs/ext2/xattr_user.c Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext2/xattr_user.c 2003-04-08 15:11:04.000000000 +0800 @@ -0,0 +1,103 @@ +/* + * linux/fs/ext2/xattr_user.c @@ -2307,8 +2244,8 @@ + ext2_xattr_unregister(EXT2_XATTR_INDEX_USER, + &ext2_xattr_user_handler); +} ---- linux-2.4.20/fs/ext3/Makefile~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext3/Makefile Sat Apr 5 03:57:36 2003 +--- linux-2.4.20/fs/ext3/Makefile~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/Makefile 2003-04-08 15:11:44.000000000 +0800 @@ -1,5 +1,5 @@ # -# Makefile for the linux ext2-filesystem routines. @@ -2316,12 +2253,8 @@ # # Note! Dependencies are done automagically by 'make dep', which also # removes any old dependencies. DON'T put your own dependencies here -@@ -12,8 +12,11 @@ - export-objs := super.o inode.o - - obj-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ -- ioctl.o namei.o super.o symlink.o hash.o -+ ioctl.o namei.o super.o symlink.o hash.o xattr.o +@@ -15,4 +15,8 @@ obj-y := balloc.o bitmap.o dir.o file + ioctl.o namei.o super.o symlink.o hash.o obj-m := $(O_TARGET) +export-objs += xattr.o @@ -2329,8 +2262,8 @@ +obj-$(CONFIG_EXT3_FS_XATTR_USER) += xattr_user.o + include $(TOPDIR)/Rules.make ---- linux-2.4.20/fs/ext3/file.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext3/file.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext3/file.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/file.c 2003-04-08 15:11:04.000000000 +0800 @@ -23,6 +23,7 @@ #include #include @@ -2349,8 +2282,8 @@ + removexattr: ext3_removexattr, /* BKL held */ }; ---- linux-2.4.20/fs/ext3/ialloc.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext3/ialloc.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext3/ialloc.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/ialloc.c 2003-04-08 15:11:04.000000000 +0800 @@ -17,6 +17,7 @@ #include #include @@ -2367,8 +2300,8 @@ DQUOT_FREE_INODE(inode); DQUOT_DROP(inode); ---- linux-2.4.20/fs/ext3/inode.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext3/inode.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext3/inode.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/inode.c 2003-04-08 15:11:05.000000000 +0800 @@ -39,6 +39,18 @@ */ #undef SEARCH_FROM_ZERO @@ -2459,8 +2392,8 @@ /* inode->i_attr_flags = 0; unused */ if (inode->u.ext3_i.i_flags & EXT3_SYNC_FL) { /* inode->i_attr_flags |= ATTR_FLAG_SYNCRONOUS; unused */ ---- linux-2.4.20/fs/ext3/namei.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext3/namei.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext3/namei.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/namei.c 2003-04-08 15:11:05.000000000 +0800 @@ -29,6 +29,7 @@ #include #include @@ -2522,8 +2455,8 @@ + removexattr: ext3_removexattr, /* BKL held */ +}; + ---- linux-2.4.20/fs/ext3/super.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext3/super.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext3/super.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/super.c 2003-04-08 15:11:05.000000000 +0800 @@ -24,6 +24,7 @@ #include #include @@ -2604,8 +2537,8 @@ } EXPORT_SYMBOL(ext3_force_commit); ---- linux-2.4.20/fs/ext3/symlink.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/ext3/symlink.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/ext3/symlink.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/symlink.c 2003-04-08 15:11:05.000000000 +0800 @@ -20,6 +20,7 @@ #include #include @@ -2635,8 +2568,8 @@ + listxattr: ext3_listxattr, /* BKL held */ + removexattr: ext3_removexattr, /* BKL held */ }; ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/fs/ext3/xattr.c Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/xattr.c 2003-04-08 15:11:05.000000000 +0800 @@ -0,0 +1,1232 @@ +/* + * linux/fs/ext3/xattr.c @@ -3870,8 +3803,8 @@ +} + +#endif /* CONFIG_EXT3_FS_XATTR_SHARING */ ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/fs/ext3/xattr_user.c Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/fs/ext3/xattr_user.c 2003-04-08 15:11:05.000000000 +0800 @@ -0,0 +1,111 @@ +/* + * linux/fs/ext3/xattr_user.c @@ -3984,8 +3917,8 @@ + ext3_xattr_unregister(EXT3_XATTR_INDEX_USER, + &ext3_xattr_user_handler); +} ---- linux-2.4.20/fs/jfs/jfs_xattr.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/jfs/jfs_xattr.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/jfs/jfs_xattr.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/jfs/jfs_xattr.h 2003-04-08 15:11:05.000000000 +0800 @@ -52,8 +52,10 @@ struct jfs_ea_list { #define END_EALIST(ealist) \ ((struct jfs_ea *) (((char *) (ealist)) + EALIST_SIZE(ealist))) @@ -3999,8 +3932,8 @@ extern ssize_t __jfs_getxattr(struct inode *, const char *, void *, size_t); extern ssize_t jfs_getxattr(struct dentry *, const char *, void *, size_t); extern ssize_t jfs_listxattr(struct dentry *, char *, size_t); ---- linux-2.4.20/fs/jfs/xattr.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/fs/jfs/xattr.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/fs/jfs/xattr.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/fs/jfs/xattr.c 2003-04-08 15:11:05.000000000 +0800 @@ -641,7 +641,7 @@ static int ea_put(struct inode *inode, s } @@ -4028,8 +3961,8 @@ size_t value_len, int flags) { if (value == NULL) { /* empty EA, do not remove */ ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/fs/mbcache.c Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/fs/mbcache.c 2003-04-08 15:11:05.000000000 +0800 @@ -0,0 +1,648 @@ +/* + * linux/fs/mbcache.c @@ -4679,8 +4612,8 @@ +module_init(init_mbcache) +module_exit(exit_mbcache) + ---- linux-2.4.20/include/asm-arm/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/asm-arm/unistd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/asm-arm/unistd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/asm-arm/unistd.h 2003-04-08 15:11:05.000000000 +0800 @@ -244,7 +244,6 @@ #define __NR_security (__NR_SYSCALL_BASE+223) #define __NR_gettid (__NR_SYSCALL_BASE+224) @@ -4697,8 +4630,8 @@ #define __NR_tkill (__NR_SYSCALL_BASE+238) /* * Please check 2.5 _before_ adding calls here, ---- linux-2.4.20/include/asm-ia64/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/asm-ia64/unistd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/asm-ia64/unistd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/asm-ia64/unistd.h 2003-04-08 15:11:05.000000000 +0800 @@ -206,8 +206,19 @@ #define __NR_getdents64 1214 #define __NR_getunwind 1215 @@ -4720,8 +4653,8 @@ * 1230-1232: reserved for futex and sched_[sg]etaffinity. */ #define __NR_tkill 1229 ---- linux-2.4.20/include/asm-ppc64/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/asm-ppc64/unistd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/asm-ppc64/unistd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/asm-ppc64/unistd.h 2003-04-08 15:11:05.000000000 +0800 @@ -218,6 +218,7 @@ #define __NR_gettid 207 #if 0 /* Reserved syscalls */ @@ -4738,8 +4671,8 @@ #define __NR_futex 221 #endif ---- linux-2.4.20/include/asm-s390/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/asm-s390/unistd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/asm-s390/unistd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/asm-s390/unistd.h 2003-04-08 15:11:05.000000000 +0800 @@ -212,9 +212,18 @@ #define __NR_madvise 219 #define __NR_getdents64 220 @@ -4762,8 +4695,8 @@ #define __NR_gettid 236 #define __NR_tkill 237 ---- linux-2.4.20/include/asm-s390x/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/asm-s390x/unistd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/asm-s390x/unistd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/asm-s390x/unistd.h 2003-04-08 15:11:05.000000000 +0800 @@ -180,9 +180,18 @@ #define __NR_pivot_root 217 #define __NR_mincore 218 @@ -4786,8 +4719,8 @@ #define __NR_gettid 236 #define __NR_tkill 237 ---- linux-2.4.20/include/asm-sparc/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/asm-sparc/unistd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/asm-sparc/unistd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/asm-sparc/unistd.h 2003-04-08 15:11:05.000000000 +0800 @@ -184,24 +184,24 @@ /* #define __NR_exportfs 166 SunOS Specific */ #define __NR_mount 167 /* Common */ @@ -4825,8 +4758,8 @@ #define __NR_tkill 187 /* SunOS: fpathconf */ /* #define __NR_sysconf 188 SunOS Specific */ #define __NR_uname 189 /* Linux Specific */ ---- linux-2.4.20/include/asm-sparc64/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/asm-sparc64/unistd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/asm-sparc64/unistd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/asm-sparc64/unistd.h 2003-04-08 15:11:05.000000000 +0800 @@ -184,24 +184,24 @@ /* #define __NR_exportfs 166 SunOS Specific */ #define __NR_mount 167 /* Common */ @@ -4864,8 +4797,8 @@ #define __NR_tkill 187 /* SunOS: fpathconf */ /* #define __NR_sysconf 188 SunOS Specific */ #define __NR_uname 189 /* Linux Specific */ ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/include/linux/cache_def.h Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/cache_def.h 2003-04-08 15:11:05.000000000 +0800 @@ -0,0 +1,15 @@ +/* + * linux/cache_def.h @@ -4882,8 +4815,8 @@ + +extern void register_cache(struct cache_definition *); +extern void unregister_cache(struct cache_definition *); ---- linux-2.4.20/include/linux/errno.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/linux/errno.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/linux/errno.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/errno.h 2003-04-08 15:11:05.000000000 +0800 @@ -23,4 +23,8 @@ #endif @@ -4893,8 +4826,8 @@ +#define ENOTSUP EOPNOTSUPP /* Operation not supported */ + #endif ---- linux-2.4.20/include/linux/ext2_fs.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/linux/ext2_fs.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/linux/ext2_fs.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/ext2_fs.h 2003-04-08 15:11:05.000000000 +0800 @@ -57,8 +57,6 @@ */ #define EXT2_BAD_INO 1 /* Bad blocks inode */ @@ -4977,8 +4910,8 @@ extern struct inode_operations ext2_fast_symlink_inode_operations; #endif /* __KERNEL__ */ ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/include/linux/ext2_xattr.h Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/ext2_xattr.h 2003-04-08 15:11:05.000000000 +0800 @@ -0,0 +1,157 @@ +/* + File: linux/ext2_xattr.h @@ -5137,8 +5070,8 @@ + +#endif /* __KERNEL__ */ + ---- linux-2.4.20/include/linux/ext3_fs.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/linux/ext3_fs.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/linux/ext3_fs.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/ext3_fs.h 2003-04-08 15:11:05.000000000 +0800 @@ -63,8 +63,6 @@ */ #define EXT3_BAD_INO 1 /* Bad blocks inode */ @@ -5221,8 +5154,8 @@ extern struct inode_operations ext3_fast_symlink_inode_operations; ---- linux-2.4.20/include/linux/ext3_jbd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/linux/ext3_jbd.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/linux/ext3_jbd.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/ext3_jbd.h 2003-04-08 15:11:05.000000000 +0800 @@ -30,13 +30,19 @@ #define EXT3_SINGLEDATA_TRANS_BLOCKS 8 @@ -5244,8 +5177,8 @@ extern int ext3_writepage_trans_blocks(struct inode *inode); ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/include/linux/ext3_xattr.h Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/ext3_xattr.h 2003-04-08 15:11:05.000000000 +0800 @@ -0,0 +1,157 @@ +/* + File: linux/ext3_xattr.h @@ -5404,8 +5337,8 @@ + +#endif /* __KERNEL__ */ + ---- linux-2.4.20/include/linux/fs.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/include/linux/fs.h Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/include/linux/fs.h~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/fs.h 2003-04-08 15:11:05.000000000 +0800 @@ -888,7 +888,7 @@ struct inode_operations { int (*setattr) (struct dentry *, struct iattr *); int (*setattr_raw) (struct inode *, struct iattr *); @@ -5415,8 +5348,8 @@ ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t); int (*removexattr) (struct dentry *, const char *); ---- /dev/null Fri Aug 30 17:31:37 2002 -+++ linux-2.4.20-braam/include/linux/mbcache.h Sat Apr 5 03:57:18 2003 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-2.4.20-braam/include/linux/mbcache.h 2003-04-08 15:11:05.000000000 +0800 @@ -0,0 +1,69 @@ +/* + File: linux/mbcache.h @@ -5487,8 +5420,8 @@ +struct mb_cache_entry *mb_cache_entry_find_next(struct mb_cache_entry *, int, + kdev_t, unsigned int); +#endif ---- linux-2.4.20/kernel/ksyms.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/kernel/ksyms.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/kernel/ksyms.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/kernel/ksyms.c 2003-04-08 15:11:05.000000000 +0800 @@ -11,6 +11,7 @@ #include @@ -5514,8 +5447,8 @@ EXPORT_SYMBOL(kmalloc); EXPORT_SYMBOL(kfree); EXPORT_SYMBOL(vfree); ---- linux-2.4.20/mm/vmscan.c~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 -+++ linux-2.4.20-braam/mm/vmscan.c Sat Apr 5 03:57:18 2003 +--- linux-2.4.20/mm/vmscan.c~linux-2.4.20-xattr-0.8.54 2003-04-08 15:11:04.000000000 +0800 ++++ linux-2.4.20-braam/mm/vmscan.c 2003-04-08 15:11:05.000000000 +0800 @@ -18,6 +18,7 @@ #include #include diff --git a/lustre/kernel_patches/prepare_tree.sh b/lustre/kernel_patches/prepare_tree.sh index f512132..7d688db 100755 --- a/lustre/kernel_patches/prepare_tree.sh +++ b/lustre/kernel_patches/prepare_tree.sh @@ -67,7 +67,7 @@ REVINO=`(cd $TREE ; stat $REVERSE | awk '($3 == "Inode:") {print $4}')` [ $ABSINO != $REVINO ] && die "inodes differ, my reverse path is bad?" -echo export PATCHSCRIPTS=$REVERSE +echo export PATCHSCRIPTS_LIBDIR=$REVERSE cd $TREE ln -sf $REVERSE/series/$SERIES series diff --git a/lustre/kernel_patches/scripts/cat-series b/lustre/kernel_patches/scripts/cat-series new file mode 100755 index 0000000..c38b1a8 --- /dev/null +++ b/lustre/kernel_patches/scripts/cat-series @@ -0,0 +1,17 @@ +#!/bin/sh + +. patchfns 2>/dev/null || +. /usr/lib/patch-scripts/patchfns 2>/dev/null || +. $PATCHSCRIPTS_LIBDIR/patchfns 2>/dev/null || +{ + echo "Impossible to find my library 'patchfns'." + echo "Check your install, or go to the right directory" + exit 1 +} + +if [ $# -eq 0 ] +then + cat_series +else + __cat_series $1 +fi diff --git a/lustre/kernel_patches/scripts/join-patch b/lustre/kernel_patches/scripts/join-patch new file mode 100755 index 0000000..065ea73 --- /dev/null +++ b/lustre/kernel_patches/scripts/join-patch @@ -0,0 +1,28 @@ +#!/bin/sh + +usage() +{ + echo "Usage: join-patch patchname" + exit 1 +} + +if [ $# -ne 1 ] +then + usage +fi + +PATCHNAME=$(stripit $1) + +if ! can_apply $PATCHNAME +then + echo Patch $PATCHNAME does not apply + exit 1 +fi + +pcpatch $PATCHNAME +for i in $(cat $P/pc/$PATCHNAME.pc) +do + fpatch $i +done + +patch -p1 -i "$P/patches/$PATCHNAME.patch" -f