| From: Joseph Qi <joseph.qi@huawei.com> |
| Date: Fri, 24 May 2013 15:55:34 -0700 |
| Subject: ocfs2: goto out_unlock if ocfs2_get_clusters_nocache() failed in |
| ocfs2_fiemap() |
| |
| commit b4ca2b4b577c3530e34dcfaafccb2cc680ce95d1 upstream. |
| |
| Last time we found there is lock/unlock bug in ocfs2_file_aio_write, and |
| then we did a thorough search for all lock resources in |
| ocfs2_inode_info, including rw, inode and open lockres and found this |
| bug. My kernel version is 3.0.13, and it is also in the lastest version |
| 3.9. In ocfs2_fiemap, once ocfs2_get_clusters_nocache failed, it should |
| goto out_unlock instead of out, because we need release buffer head, up |
| read alloc sem and unlock inode. |
| |
| Signed-off-by: Joseph Qi <joseph.qi@huawei.com> |
| Reviewed-by: Jie Liu <jeff.liu@oracle.com> |
| Cc: Mark Fasheh <mfasheh@suse.com> |
| Cc: Joel Becker <jlbec@evilplan.org> |
| Acked-by: Sunil Mushran <sunil.mushran@gmail.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| fs/ocfs2/extent_map.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/ocfs2/extent_map.c |
| +++ b/fs/ocfs2/extent_map.c |
| @@ -791,7 +791,7 @@ int ocfs2_fiemap(struct inode *inode, st |
| &hole_size, &rec, &is_last); |
| if (ret) { |
| mlog_errno(ret); |
| - goto out; |
| + goto out_unlock; |
| } |
| |
| if (rec.e_blkno == 0ULL) { |
