smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

[fs/lustre-release.git] / lustre / kernel_patches / patches / linux-2.4.19-xattr-0.8.54-suse.patch

diff --git a/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch b/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch
index 79c48fb..26d3af9 100644 (file)
--- a/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch
@@ -2,10 +2,10 @@
  ext3/ext3-exports.c |   13 +++++++++++++
  2 files changed, 14 insertions(+), 2 deletions(-)
 
-Index: linux-2.4.19/fs/ext2/super.c
+Index: linux-2.4.19.SuSE/fs/ext2/super.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext2/super.c  2004-04-23 17:53:55.000000000 -0400
-+++ linux-2.4.19/fs/ext2/super.c       2004-04-23 22:30:41.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext2/super.c     Mon Jan 27 05:08:00 2003
++++ linux-2.4.19.SuSE/fs/ext2/super.c  Sun Nov 16 00:40:59 2003
 @@ -70,6 +70,7 @@
  {
        va_list args;
@@ -14,11 +14,11 @@ Index: linux-2.4.19/fs/ext2/super.c
        if (!(sb->s_flags & MS_RDONLY)) {
                sb->u.ext2_sb.s_mount_state |= EXT2_ERROR_FS;
                sb->u.ext2_sb.s_es->s_state =
-Index: linux-2.4.19/fs/ext3/super.c
+Index: linux-2.4.19.SuSE/fs/ext3/super.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/super.c  2004-04-23 18:26:27.000000000 -0400
-+++ linux-2.4.19/fs/ext3/super.c       2004-04-23 22:30:41.000000000 -0400
-@@ -1827,8 +1827,6 @@
+--- linux-2.4.19.SuSE.orig/fs/ext3/super.c     Mon Jan 27 05:08:00 2003
++++ linux-2.4.19.SuSE/fs/ext3/super.c  Sun Nov 16 00:40:59 2003
+@@ -1822,8 +1828,6 @@
        exit_ext3_xattr();
  }
  
@@ -27,10 +27,10 @@ Index: linux-2.4.19/fs/ext3/super.c
  
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
-Index: linux-2.4.19/fs/ext3/ext3-exports.c
+Index: linux-2.4.19.SuSE/fs/ext3/ext3-exports.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/ext3-exports.c   2003-01-30 05:24:37.000000000 -0500
-+++ linux-2.4.19/fs/ext3/ext3-exports.c        2004-04-23 22:30:41.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/ext3-exports.c      Sun Nov 16 00:40:58 2003
++++ linux-2.4.19.SuSE/fs/ext3/ext3-exports.c   Sun Nov 16 00:40:59 2003
 @@ -0,0 +1,13 @@
 +#include <linux/config.h>
 +#include <linux/module.h>
@@ -45,16 +45,3 @@ Index: linux-2.4.19/fs/ext3/ext3-exports.c
 +EXPORT_SYMBOL(ext3_xattr_get);
 +EXPORT_SYMBOL(ext3_xattr_list);
 +EXPORT_SYMBOL(ext3_xattr_set);
-Index: linux-2.4.19/fs/ext3/Makefile
-===================================================================
---- linux-2.4.19.orig/fs/ext3/Makefile 2004-04-23 18:26:27.000000000 -0400
-+++ linux-2.4.19/fs/ext3/Makefile      2004-04-23 23:05:20.000000000 -0400
-@@ -9,7 +9,7 @@
- 
- O_TARGET := ext3.o
- 
--export-objs :=        super.o inode.o
-+export-objs :=        ext3-exports.c
- 
- 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