From cbd8a2bb7dba1e64950d2a411a76916b103315f5 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 24 Sep 2012 21:04:57 -0700
Subject: [PATCH] --- yaml --- r: 331695 b: refs/heads/master c:
 457712a0bc5389b75d2c93840a684fd77df2aabb h: refs/heads/master i:   331693:
 fed2b3a7f751ac68116cc511138c8a9bbe54eb70   331691:
 041967e63b19bf0658799604409c502a97d15eab   331687:
 9fa3c4dd195cff8d6654be84aad6fd49e3a32477   331679:
 61063805b4aa69dde43dd4bee875955d7cc64f69 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/ioctl.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dc722ce9db88..6a51e7fe4b0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cae3717cddaf8e5e96e304733dca66e40d56f89
+refs/heads/master: 457712a0bc5389b75d2c93840a684fd77df2aabb
diff --git a/trunk/fs/ceph/ioctl.c b/trunk/fs/ceph/ioctl.c
index 1396ceb46797..36549a46e311 100644
--- a/trunk/fs/ceph/ioctl.c
+++ b/trunk/fs/ceph/ioctl.c
@@ -187,14 +187,18 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
 	u64 tmp;
 	struct ceph_object_layout ol;
 	struct ceph_pg pgid;
+	int r;
 
 	/* copy and validate */
 	if (copy_from_user(&dl, arg, sizeof(dl)))
 		return -EFAULT;
 
 	down_read(&osdc->map_sem);
-	ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, &len,
-				      &dl.object_no, &dl.object_offset, &olen);
+	r = ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, &len,
+					  &dl.object_no, &dl.object_offset,
+					  &olen);
+	if (r < 0)
+		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);