--- /dev/null
+From: Tao Ma <tao.ma@oracle.com>
+Date: Fri, 5 Dec 2008 09:14:10 +0800
+Subject: ocfs2: Always update xattr search when creating bucket.
+
+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>
+Signed-off-by: Mark Fasheh <mfasheh@suse.com>
+---
+ fs/ocfs2/xattr.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
+===================================================================
+--- linux-2.6.27-ocfs2.orig/fs/ocfs2/xattr.c
++++ linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
+@@ -2645,9 +2645,9 @@ static int ocfs2_xattr_update_xattr_sear
+ 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;