diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-06 08:11:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 08:11:33 +0100 |
| commit | 7119a341f35b0a3ddcf426818267980057c770a1 (patch) | |
| tree | 37e3b68d02bfc6f7759bf711e00d612ba86865b5 /fs/ocfs2/alloc.c | |
| parent | 87cdee71166fa107c5dc8e43060eeefa533c6a3b (diff) | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
Merge commit 'v3.2-rc4' into core/locking
Merge reason: Pick up post-rc1 fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ocfs2/alloc.c')
| -rw-r--r-- | fs/ocfs2/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index ed553c60de8..3165aebb43c 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -5699,7 +5699,7 @@ int ocfs2_remove_btree_range(struct inode *inode, OCFS2_JOURNAL_ACCESS_WRITE); if (ret) { mlog_errno(ret); - goto out; + goto out_commit; } dquot_free_space_nodirty(inode, |