[Ocfs2-devel] [PATCH] ocfs2: Always update xattr search when creating bucket.

[Ocfs2-devel] [PATCH] ocfs2: Always update xattr search when creating bucket.

[Tao Ma]

When we create xattr bucket during the process of xattr set, we always
need to update the ocfs2_xattr_search since even if the bucket size is
the same as block size, the offset will change because of the removal
of the ocfs2_xattr_block header.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
---
 fs/ocfs2/xattr.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 054e2ef..74d7367 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -2645,9 +2645,9 @@ static int ocfs2_xattr_update_xattr_search(struct inode *inode,
 				return ret;
 			}
 
-			i = xs->here - old_xh->xh_entries;
-			xs->here = &xs->header->xh_entries[i];
 		}
+		i = xs->here - old_xh->xh_entries;
+		xs->here = &xs->header->xh_entries[i];
 	}
 
 	return ret;
-- 
1.5.4.GIT

[Ocfs2-devel] [PATCH] ocfs2: Always update xattr search when creating bucket.

[Mark Fasheh]

On Fri, Dec 05, 2008 at 09:14:10AM +0800, Tao Ma wrote:
> When we create xattr bucket during the process of xattr set, we always
> need to update the ocfs2_xattr_search since even if the bucket size is
> the same as block size, the offset will change because of the removal
> of the ocfs2_xattr_block header.

Ok, this is in the fixes branch now. I will send it upstream tommorrow. By
the way - am I correct in that merge_window seems to have fixed this
already?
	--Mark

--
Mark Fasheh

[Ocfs2-devel] [PATCH] ocfs2: Always update xattr search when creating bucket.

[Tao Ma]

Mark Fasheh wrote:
> On Fri, Dec 05, 2008 at 09:14:10AM +0800, Tao Ma wrote:
>> When we create xattr bucket during the process of xattr set, we always
>> need to update the ocfs2_xattr_search since even if the bucket size is
>> the same as block size, the offset will change because of the removal
>> of the ocfs2_xattr_block header.
> 
> Ok, this is in the fixes branch now. I will send it upstream tommorrow. By
> the way - am I correct in that merge_window seems to have fixed this
> already?
no, and AFAICS, there is a minor merge conflict with the merge window 
because of Joel's refactoring of xattr buckets, but it can be easily 
resolved. ;)

Regards,
Tao