Skip to contentSkip to conversation

ocfs2: goto out_unlock if ocfs2_get_clusters_nocache failed in ocfs2_fiemap

PATCH New Joseph Qi 2 participants 2 messages May 14, 2013 – May 22, 2013 OCFS2

lore
Share & tools
lore

Joseph Qi

author
#0 lore raw

PATCH v2 1/1 ocfs2: goto out_unlock if ocfs2_get_clusters_nocache failed in ocfs2_fiemap

Last time we found there is a lock/unlock bug in ocfs2_file_aio_write, and then we did a thoroughly 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.

Cc stable at vger.kernel.org
---
 fs/ocfs2/extent_map.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/extent_map.c +1 -1
index 1c39efb..2487116 100644
@@ -790,7 +790,7 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 						 &hole_size, &rec, &is_last);
 		if (ret) {
 			mlog_errno(ret);
-			goto out;
+			goto out_unlock;
 		}
 
 		if (rec.e_blkno == 0ULL) {
Signature · 1 line
1.7.9.7
#1 lore raw

PATCH v2 1/1 ocfs2: goto out_unlock if ocfs2_get_clusters_nocache failed in ocfs2_fiemap

Quoted 32 lines · Joseph Qi

Last time we found there is a lock/unlock bug in ocfs2_file_aio_write, and then we did a thoroughly 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.

Cc stable at vger.kernel.org
---
 fs/ocfs2/extent_map.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/extent_map.c +1 -1
index 1c39efb..2487116 100644
@@ -790,7 +790,7 @@ int ocfs2_fiemap(struct inode *inode, struct
 fiemap_extent_info *fieinfo,
                                                 &hole_size, &rec,
 &is_last);
                if (ret) {
                        mlog_errno(ret);
-                       goto out;
+                       goto out_unlock;
                }
                if (rec.e_blkno == 0ULL) {
Quoted 9 lines

--
1.7.9.7

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20130522/775d6888/attachment.html