From: majianpeng <majianpeng@gmail.com>
Date: Tue, 16 Jul 2013 11:36:21 +0000 (+0800)
Subject: ceph: Don't forget the 'up_read(&osdc->map_sem)' if met error.
X-Git-Tag: upstream/snapshot3+hdmi~4278^2~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=494ddd11be3e2621096bb425eed2886f8e8446d4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ceph: Don't forget the 'up_read(&osdc->map_sem)' if met error.

CC: stable@vger.kernel.org
Signed-off-by: Jianpeng Ma <majianpeng@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index e0b4ef3..a5ce62e 100644
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -196,8 +196,10 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
 	r = ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, len,
 					  &dl.object_no, &dl.object_offset,
 					  &olen);
-	if (r < 0)
+	if (r < 0) {
+		up_read(&osdc->map_sem);
 		return -EIO;
+	}
 	dl.file_offset -= dl.object_offset;
 	dl.object_size = ceph_file_layout_object_size(ci->i_layout);
 	dl.block_size = ceph_file_layout_su(ci->i_layout);