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-pre1-xattr-0.8.54.patch

diff --git a/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch
index e694068..4107e70 100644 (file)
--- a/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch
@@ -156,7 +156,7 @@ Index: linux-2.4.19-pre1/arch/alpha/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -195,7 +195,7 @@ Index: linux-2.4.19-pre1/arch/arm/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -240,7 +240,7 @@ Index: linux-2.4.19-pre1/arch/i386/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -293,7 +293,7 @@ Index: linux-2.4.19-pre1/arch/ia64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -346,7 +346,7 @@ Index: linux-2.4.19-pre1/arch/m68k/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -364,7 +364,7 @@ Index: linux-2.4.19-pre1/arch/mips/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -382,7 +382,7 @@ Index: linux-2.4.19-pre1/arch/mips64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -396,11 +396,18 @@ Index: linux-2.4.19-pre1/arch/ppc/defconfig
 ===================================================================
 --- linux-2.4.19-pre1.orig/arch/ppc/defconfig  2004-01-14 01:10:36.000000000 +0300
 +++ linux-2.4.19-pre1/arch/ppc/defconfig       2004-01-14 01:11:49.000000000 +0300
-@@ -1,6 +1,13 @@
+@@ -1,6 +1,20 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
++# CONFIG_EXT3_FS_XATTR_SHARING is not set
++# CONFIG_EXT3_FS_XATTR_USER is not set
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XATTR_SHARING is not set
++# CONFIG_EXT2_FS_XATTR_USER is not set
++# CONFIG_FS_MBCACHE is not set
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -418,7 +425,7 @@ Index: linux-2.4.19-pre1/arch/s390/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -462,7 +469,7 @@ Index: linux-2.4.19-pre1/arch/s390x/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -606,7 +613,7 @@ Index: linux-2.4.19-pre1/arch/sparc/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -645,7 +652,7 @@ Index: linux-2.4.19-pre1/arch/sparc64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1881,7 +1888,7 @@ Index: linux-2.4.19-pre1/fs/ext2/xattr.c
 +              } else if (old_bh && header == HDR(old_bh)) {
 +                      /* Keep this block. */
 +                      new_bh = old_bh;
-+                      (void)ext2_xattr_cache_insert(new_bh);
++                      ext2_xattr_cache_insert(new_bh);
 +              } else {
 +                      /* We need to allocate a new block */
 +                      int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1900,7 +1907,7 @@ Index: linux-2.4.19-pre1/fs/ext2/xattr.c
 +                      memcpy(new_bh->b_data, header, new_bh->b_size);
 +                      mark_buffer_uptodate(new_bh, 1);
 +                      unlock_buffer(new_bh);
-+                      (void)ext2_xattr_cache_insert(new_bh);
++                      ext2_xattr_cache_insert(new_bh);
 +                      
 +                      ext2_xattr_update_super_block(sb);
 +              }
@@ -3563,7 +3570,7 @@ Index: linux-2.4.19-pre1/fs/ext3/xattr.c
 +              } else if (old_bh && header == HDR(old_bh)) {
 +                      /* Keep this block. */
 +                      new_bh = old_bh;
-+                      (void)ext3_xattr_cache_insert(new_bh);
++                      ext3_xattr_cache_insert(new_bh);
 +              } else {
 +                      /* We need to allocate a new block */
 +                      int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3588,7 +3595,7 @@ Index: linux-2.4.19-pre1/fs/ext3/xattr.c
 +                      memcpy(new_bh->b_data, header, new_bh->b_size);
 +                      mark_buffer_uptodate(new_bh, 1);
 +                      unlock_buffer(new_bh);
-+                      (void)ext3_xattr_cache_insert(new_bh);
++                      ext3_xattr_cache_insert(new_bh);
 +                      
 +                      ext3_xattr_update_super_block(handle, sb);
 +              }