[Ocfs2-devel] [PATCH] ocfs2: unlock rw lock if inode lock failed

Joseph Qi joseph.qi at huawei.com
Mon May 6 07:43:39 PDT 2013


In ocfs2_file_aio_write, it does ocfs2_rw_lock first and then
ocfs2_inode_lock. But if ocfs2_inode_lock failed, it goes to out_sems
without unlocking rw lock. This will cause a bug in ocfs2_lock_res_free
when testing res->l_ex_holders, which is increased in
__ocfs2_cluster_lock and decreased in __ocfs2_cluster_unlock.

Signed-off-by: Joseph Qi <joseph.qi at huawei.com>

---
 fs/ocfs2/file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 6474cb4..e2cd7a8 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2290,7 +2290,7 @@ relock:
 		ret = ocfs2_inode_lock(inode, NULL, 1);
 		if (ret < 0) {
 			mlog_errno(ret);
-			goto out_sems;
+			goto out;
 		}

 		ocfs2_inode_unlock(inode, 1);
-- 
1.7.9.7




More information about the Ocfs2-devel mailing list