Commit b4ca2b4b authored May 24, 2013 by Joseph Qi Committed by Linus Torvalds May 24, 2013

ocfs2: goto out_unlock if ocfs2_get_clusters_nocache() failed in ocfs2_fiemap()



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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 10b3a32d

fs/ocfs2/extent_map.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message