diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 15:01:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 15:01:23 -0800 |
| commit | 0bc77ecbe4f69ff8ead1d2abfe84ca9ba2a7bca4 (patch) | |
| tree | a9d2f83e9ee9b20720cd83432ce7bfeb44690b3d /fs/ocfs2/xattr.c | |
| parent | 3797455fd269f6ae0bc228d5206b502830af03f4 (diff) | |
| parent | a97721894a6dc0f9ebfe1dbaa4bb112eaf399273 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Add JBD2 compat feature bit.
ocfs2: Always update xattr search when creating bucket.
Diffstat (limited to 'fs/ocfs2/xattr.c')
| -rw-r--r-- | 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 054e2efb0b7..74d7367ade1 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; |