From 0aac7ecedded5703804f091362e97023c8daa49f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 24 Sep 2012 21:02:47 -0700 Subject: [PATCH] --- yaml --- r: 331694 b: refs/heads/master c: 6cae3717cddaf8e5e96e304733dca66e40d56f89 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 891b2a8ebe4c..dc722ce9db88 100644 --- 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 index 2f1bef8c1d88..bb3d9be3b1b4 100644 --- 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,