summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/localalloc.c
diff options
context:
space:
mode:
authorTim Shimmin <tes@chook.melbourne.sgi.com>2007-10-11 16:52:59 +1000
committerTim Shimmin <tes@chook.melbourne.sgi.com>2007-10-11 16:52:59 +1000
commitc1561cf463f4a480d1960e833c8fe628207b24e4 (patch)
treeb612e5257611ef33196aacc00fba813c943384d5 /fs/ocfs2/localalloc.c
parent053c59a0a7234bac669992f5b8b933b7d7fc189d (diff)
parentbbf25010f1a6b761914430f5fca081ec8c7accd1 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/ocfs2/localalloc.c')
-rw-r--r--fs/ocfs2/localalloc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
index de984d27257..d272847d5a0 100644
--- a/fs/ocfs2/localalloc.c
+++ b/fs/ocfs2/localalloc.c
@@ -514,8 +514,10 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
ac->ac_bh = osb->local_alloc_bh;
status = 0;
bail:
- if (status < 0 && local_alloc_inode)
+ if (status < 0 && local_alloc_inode) {
+ mutex_unlock(&local_alloc_inode->i_mutex);
iput(local_alloc_inode);
+ }
mlog_exit(status);
return status;