X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Flinux-2.4.24-xattr-0.8.54.patch;h=5bd7ac4d2671bc3681610a86e99174ab155850f1;hb=5fcba89a063d2e2bd9b6c0873a2e77465413c165;hp=144ff3fb79456a905edd88fe3b7fe23af341b9c7;hpb=090c677210ee2946d99c71412e4ff762bb300f4f;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch
index 144ff3f..5bd7ac4 100644
--- a/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch
@@ -156,7 +156,7 @@ Index: linux-2.4.24-vanilla/arch/alpha/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -197,7 +197,7 @@ Index: linux-2.4.24-vanilla/arch/arm/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -250,7 +250,7 @@ Index: linux-2.4.24-vanilla/arch/i386/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -268,7 +268,7 @@ Index: linux-2.4.24-vanilla/arch/ia64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -286,7 +286,7 @@ Index: linux-2.4.24-vanilla/arch/m68k/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -304,7 +304,7 @@ Index: linux-2.4.24-vanilla/arch/mips/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -322,7 +322,7 @@ Index: linux-2.4.24-vanilla/arch/mips64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -340,7 +340,7 @@ Index: linux-2.4.24-vanilla/arch/s390/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -393,7 +393,7 @@ Index: linux-2.4.24-vanilla/arch/s390x/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -549,7 +549,7 @@ Index: linux-2.4.24-vanilla/arch/sparc64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+# CONFIG_EXT3_FS_XATTR is not set
++CONFIG_EXT3_FS_XATTR=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1123,7 +1123,7 @@ Index: linux-2.4.24-vanilla/fs/ext2/xattr.c
 +void
 +ext2_xattr_unregister(int name_index, struct ext2_xattr_handler *handler)
 +{
-+	if (name_index > 0 || name_index <= EXT2_XATTR_INDEX_MAX) {
++	if (name_index > 0 && name_index <= EXT2_XATTR_INDEX_MAX) {
 +		write_lock(&ext2_handler_lock);
 +		ext2_xattr_handlers[name_index-1] = NULL;
 +		write_unlock(&ext2_handler_lock);
@@ -1738,7 +1738,7 @@ Index: linux-2.4.24-vanilla/fs/ext2/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			ext2_xattr_cache_insert(new_bh);
++			(void)ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1757,7 +1757,7 @@ Index: linux-2.4.24-vanilla/fs/ext2/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			ext2_xattr_cache_insert(new_bh);
++			(void)ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3426,7 +3426,7 @@ Index: linux-2.4.24-vanilla/fs/ext3/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			ext3_xattr_cache_insert(new_bh);
++			(void)ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3451,7 +3451,7 @@ Index: linux-2.4.24-vanilla/fs/ext3/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			ext3_xattr_cache_insert(new_bh);
++			(void)ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}