summaryrefslogtreecommitdiff
path: root/fs/ocfs2/xattr.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-12-18 03:06:12 +0300
committerPaul Mackerras <paulus@samba.org>2008-12-18 03:06:12 +0300
commitc280266a326ccabeb64b6d69fa4fd21faf5bf354 (patch)
treef8a89e593a0ba43b75bb666d8e245b2460dc0d40 /fs/ocfs2/xattr.c
parenteddce368f99b682683e09cf206eaa25131d40abe (diff)
parent55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff)
downloadlinux-c280266a326ccabeb64b6d69fa4fd21faf5bf354.tar.xz
Merge branch 'linux-2.6' into next
Diffstat (limited to 'fs/ocfs2/xattr.c')
-rw-r--r--fs/ocfs2/xattr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 054e2efb0b7e..74d7367ade13 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;