---

yaml --- r: 331694 b: refs/heads/master c: 6cae371 h: refs/heads/master v: v3
git-mirror · Oct 1, 2012 · 0aac7ec · 0aac7ec
1 parent fed2b3a
commit 0aac7ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6816282dab3a72efe8c0d182c1bc2960d87f4322
+refs/heads/master: 6cae3717cddaf8e5e96e304733dca66e40d56f89
diff --git a/trunk/drivers/block/rbd.c b/trunk/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,