X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Flinux-2.4.20-xattr-0.8.54.patch;h=f078ebe3e547daa5263e4042d690d6d57e0d5e47;hb=4aec4547e903afbb8aec6890aaa341f826e931d8;hp=1489989433ae1785f9545899732bb80c06be69c5;hpb=96ec6856f91f7f9031cfce4273c714d72cfe59ae;p=fs%2Flustre-release.git

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 1489989..f078ebe 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
@@ -152,7 +152,7 @@
  #
  # 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
@@ -189,7 +189,7 @@
  #
  # 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
@@ -238,7 +238,7 @@
  #
  # 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
@@ -254,7 +254,7 @@
  #
  # 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
@@ -303,7 +303,7 @@
  #
  # 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
@@ -319,7 +319,7 @@
  #
  # 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
@@ -335,7 +335,7 @@
  #
  # 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
@@ -347,18 +347,11 @@
  CONFIG_MIPS64=y
 --- linux-2.4.20/arch/ppc/defconfig~linux-2.4.20-xattr-0.8.54	2002-11-29 07:53:11.000000000 +0800
 +++ linux-2.4.20-root/arch/ppc/defconfig	2003-05-07 18:08:03.000000000 +0800
-@@ -1,6 +1,20 @@
+@@ -1,6 +1,13 @@
  #
  # Automatically generated make config: don't edit
  #
-+# 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=y
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -392,7 +385,7 @@
  #
  # 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
@@ -441,7 +434,7 @@
  #
  # 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
@@ -588,7 +581,7 @@
  #
  # 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
@@ -623,7 +616,7 @@
  #
  # 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
@@ -1828,7 +1821,7 @@
 +		} 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;
@@ -1847,7 +1840,7 @@
 +			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);
 +		}
@@ -2283,7 +2276,7 @@
 +#endif
 +	if (error)
 +		return error;
-+  
++
 +	return ext2_xattr_set(inode, EXT2_XATTR_INDEX_USER, name,
 +			      value, size, flags);
 +}
@@ -3492,7 +3485,7 @@
 +		} 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;
@@ -3517,7 +3510,7 @@
 +			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);
 +		}
@@ -3956,7 +3949,7 @@
 +#endif
 +	if (error)
 +		return error;
-+  
++
 +	handle = ext3_journal_start(inode, EXT3_XATTR_TRANS_BLOCKS);
 +	if (IS_ERR(handle))
 +		return PTR_ERR(handle);