diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 16:07:37 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 16:07:48 -0800 |
commit | a36ae95c4e220afb976dd9d0d813d01e882b7b59 (patch) | |
tree | 5a128e3f6a5a0d29c9dfd81a116381452951318f /fs/ocfs2/xattr.c | |
parent | b870defebde40d01d951c9affd86c59841757c31 (diff) | |
parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
download | op-kernel-dev-a36ae95c4e220afb976dd9d0d813d01e882b7b59.zip op-kernel-dev-a36ae95c4e220afb976dd9d0d813d01e882b7b59.tar.gz |
Merge v3.2-rc4 into usb-next
This lets us handle the PS3 merge easier, as well as syncing up with
other USB fixes already in the -rc4 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/ocfs2/xattr.c')
-rw-r--r-- | fs/ocfs2/xattr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 194fb22..aa9e877 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -2376,16 +2376,18 @@ static int ocfs2_remove_value_outside(struct inode*inode, } ret = ocfs2_xattr_value_truncate(inode, vb, 0, &ctxt); - if (ret < 0) { - mlog_errno(ret); - break; - } ocfs2_commit_trans(osb, ctxt.handle); if (ctxt.meta_ac) { ocfs2_free_alloc_context(ctxt.meta_ac); ctxt.meta_ac = NULL; } + + if (ret < 0) { + mlog_errno(ret); + break; + } + } if (ctxt.meta_ac) |