1 files changed, 9 insertions, 3 deletions

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index e0b4ef31d3c8..669622fd1ae3 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);
@@ -209,8 +211,12 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
         snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
                  ceph_ino(inode), dl.object_no);
 
-        ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
-                ceph_file_layout_pg_pool(ci->i_layout));
+        r = ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
+                                ceph_file_layout_pg_pool(ci->i_layout));
+        if (r < 0) {
+                up_read(&osdc->map_sem);
+                return r;
+        }
 
         dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);
         if (dl.osd >= 0) {