Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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.22-xattr-0.8.54.patch
diff --git
a/lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch
b/lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch
index
fd5f0c2
..
937aa40
100644
(file)
--- a/
lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch
+++ b/
lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch
@@
-156,7
+156,7
@@
Index: linux-2.4.22-vanilla/arch/alpha/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/arm/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/i386/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/ia64/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/m68k/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/mips/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/mips64/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/s390/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/s390x/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_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.22-vanilla/arch/sparc64/defconfig
#
# Automatically generated make config: don't edit
#
#
# 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_EXT3_FS_XATTR_SHARING is not set
+# CONFIG_EXT3_FS_XATTR_USER is not set
+# CONFIG_EXT2_FS_XATTR is not set
@@
-1738,7
+1738,7
@@
Index: linux-2.4.22-vanilla/fs/ext2/xattr.c
+ } else if (old_bh && header == HDR(old_bh)) {
+ /* Keep this block. */
+ new_bh = old_bh;
+ } 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;
+ } 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.22-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);
+ 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);
+ }
+
+ ext2_xattr_update_super_block(sb);
+ }
@@
-3426,7
+3426,7
@@
Index: linux-2.4.22-vanilla/fs/ext3/xattr.c
+ } else if (old_bh && header == HDR(old_bh)) {
+ /* Keep this block. */
+ new_bh = old_bh;
+ } 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;
+ } 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.22-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);
+ 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);
+ }
+
+ ext3_xattr_update_super_block(handle, sb);
+ }