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

diff --git a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch
index f1365d7..ad36c0f 100644 (file)
--- a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch
@@ -125,7 +125,7 @@
  #
  # 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
@@ -1294,7 +1294,7 @@
 +              } 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;
@@ -1313,7 +1313,7 @@
 +                      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);
 +              }
@@ -2957,7 +2957,7 @@
 +              } 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;
@@ -2982,7 +2982,7 @@
 +                      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);
 +              }