summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Fasheh <mfasheh@suse.com>2008-07-21 17:06:15 -0700
committerMark Fasheh <mfasheh@suse.com>2008-07-21 17:06:15 -0700
commit2bfa7ed479e33fda4e759ccb533558a0fbc97c72 (patch)
tree2f5abac5093a06f3a8a8c5b25230ff2e084d0c36
parentae824e41ce73545e87818638c1d9f99cd949ea1c (diff)
parent1a9e1bab38acc0e02f3a55ca6bcda7cbf5ca4508 (diff)
Merge branch 'mutex_fix' into linux-next
-rw-r--r--fs/ocfs2/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index e8514e8b6ce8..1f25b3a7f400 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1766,8 +1766,8 @@ out_inode_unlock:
out_rw_unlock:
ocfs2_rw_unlock(inode, 1);
- mutex_unlock(&inode->i_mutex);
out:
+ mutex_unlock(&inode->i_mutex);
return ret;
}