diff --git a/[refs] b/[refs] index e4312d3801ae..5a11e3f351d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0f73cfc36ed62decdd3f78e943bbfd00ee80e49 +refs/heads/master: 06b240d8af21ddee4cfec3b0f02b81d9f168a98a diff --git a/trunk/fs/ocfs2/xattr.c b/trunk/fs/ocfs2/xattr.c index b2e25a828e38..b1f2a164e7dc 100644 --- a/trunk/fs/ocfs2/xattr.c +++ b/trunk/fs/ocfs2/xattr.c @@ -4003,8 +4003,10 @@ static void ocfs2_xattr_set_entry_normal(struct inode *inode, else if (name_hash < le32_to_cpu(tmp_xe->xe_name_hash)) high = tmp - 1; - else + else { + low = tmp; break; + } } xe = &xh->xh_entries[low];