From c3ec8a861afa8c42ba3a45b0a31acbf97505a4d0 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 23 Jan 2004 16:08:57 +0000 Subject: [PATCH] - minor bug fixed in ea-in-inode for ext3 --- .../kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch | 9 +++++---- lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch | 9 +++++---- .../kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch | 9 +++++---- .../kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch | 9 +++++---- lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch | 9 +++++---- lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch | 9 +++++---- 6 files changed, 30 insertions(+), 24 deletions(-) diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch index bc6ee77..108cc43 100644 --- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch +++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch @@ -603,7 +603,7 @@ * ext3_xattr_set() * * Create, replace or remove an extended attribute for this inode. Buffer -@@ -583,6 +1067,100 @@ static void ext3_xattr_update_super_bloc +@@ -583,6 +1067,101 @@ static void ext3_xattr_update_super_bloc */ int ext3_xattr_set(handle_t *handle, struct inode *inode, int name_index, @@ -643,10 +643,11 @@ + if (err != 0 && err != -ENOENT) { + /* not found EA in block */ + goto finish; ++ } else if (err == 0) { ++ /* found EA in block */ ++ where = 1; ++ found = 1; + } -+ /* found EA in block */ -+ where = 1; -+ found = 1; + } else + goto finish; + diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch index cd569f4..55fa141 100644 --- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch +++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch @@ -605,7 +605,7 @@ * ext3_xattr_set() * * Create, replace or remove an extended attribute for this inode. Buffer -@@ -566,6 +1050,100 @@ static void ext3_xattr_update_super_bloc +@@ -566,6 +1050,101 @@ static void ext3_xattr_update_super_bloc */ int ext3_xattr_set(handle_t *handle, struct inode *inode, int name_index, @@ -645,10 +645,11 @@ + if (err != 0 && err != -ENOENT) { + /* not found EA in block */ + goto finish; ++ } else if (err == 0) { ++ /* found EA in block */ ++ where = 1; ++ found = 1; + } -+ /* found EA in block */ -+ where = 1; -+ found = 1; + } else + goto finish; + diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch index b09a58b..4a68c63 100644 --- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch +++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch @@ -331,7 +331,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c /* * If the EXT3_FEATURE_COMPAT_EXT_ATTR feature of this file system is * not set, set it. -@@ -480,6 +691,101 @@ +@@ -480,6 +691,102 @@ */ int ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, @@ -372,10 +372,11 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c + if (err != 0 && err != -ENOENT) { + /* not found EA in block */ + goto finish; ++ } else if (err == 0) { ++ /* found EA in block */ ++ where = 1; ++ found = 1; + } -+ /* found EA in block */ -+ where = 1; -+ found = 1; + } else + goto finish; + diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch index e1dab00..0f0490b 100644 --- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch +++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch @@ -331,7 +331,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c /* * If the EXT3_FEATURE_COMPAT_EXT_ATTR feature of this file system is * not set, set it. -@@ -480,6 +691,101 @@ +@@ -480,6 +691,102 @@ */ int ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, @@ -372,10 +372,11 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c + if (err != 0 && err != -ENOENT) { + /* not found EA in block */ + goto finish; ++ } else if (err == 0) { ++ /* found EA in block */ ++ where = 1; ++ found = 1; + } -+ /* found EA in block */ -+ where = 1; -+ found = 1; + } else + goto finish; + diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch index 5800fe0..736a930 100644 --- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch +++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch @@ -620,7 +620,7 @@ * ext3_xattr_set() * * Create, replace or remove an extended attribute for this inode. Buffer -@@ -566,6 +1050,100 @@ static void ext3_xattr_update_super_bloc +@@ -566,6 +1050,101 @@ static void ext3_xattr_update_super_bloc */ int ext3_xattr_set(handle_t *handle, struct inode *inode, int name_index, @@ -660,10 +660,11 @@ + if (err != 0 && err != -ENOENT) { + /* not found EA in block */ + goto finish; ++ } else if (err == 0) { ++ /* found EA in block */ ++ where = 1; ++ found = 1; + } -+ /* found EA in block */ -+ where = 1; -+ found = 1; + } else + goto finish; + diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch index 8a2e578..5e755d9 100644 --- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch +++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch @@ -644,7 +644,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c * ext3_xattr_set_handle() * * Create, replace or remove an extended attribute for this inode. Buffer -@@ -470,6 +959,103 @@ +@@ -470,6 +959,104 @@ */ int ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index, @@ -686,10 +686,11 @@ Index: linux-2.6.0/fs/ext3/xattr.c + if (err != 0 && err != -ENOENT) { + /* not found EA in block */ + goto finish; ++ } else if (err == 0) { ++ /* found EA in block */ ++ where = 1; ++ found = 1; + } -+ /* found EA in block */ -+ where = 1; -+ found = 1; + } else + goto finish; + -- 1.8.3.1