summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-09-24 21:02:47 -0700
committerAlex Elder <elder@inktank.com>2012-10-01 17:20:00 -0500
commit6cae3717cddaf8e5e96e304733dca66e40d56f89 (patch)
treee8b6d6f977557ba7e7c5dd24df702fa27a509c41
parent6816282dab3a72efe8c0d182c1bc2960d87f4322 (diff)
downloadlinux-stable-6cae3717cddaf8e5e96e304733dca66e40d56f89.tar.gz
linux-stable-6cae3717cddaf8e5e96e304733dca66e40d56f89.tar.bz2
linux-stable-6cae3717cddaf8e5e96e304733dca66e40d56f89.zip
rbd: BUG on invalid layout
This shouldn't actually be possible because the layout struct is constructed from the RBD header and validated then. [elder@inktank.com: converted BUG() call to equivalent rbd_assert()] Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Alex Elder <elder@inktank.com>
-rw-r--r--drivers/block/rbd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 2f1bef8c1d88..bb3d9be3b1b4 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1020,8 +1020,9 @@ static int rbd_do_request(struct request *rq,
layout->fl_stripe_count = cpu_to_le32(1);
layout->fl_object_size = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);
layout->fl_pg_pool = cpu_to_le32(rbd_dev->pool_id);
- ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,
- req, ops);
+ ret = ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,
+ req, ops);
+ rbd_assert(ret == 0);
ceph_osdc_build_request(req, ofs, &len,
ops,