summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2014-02-25 16:22:27 +0200
committerYan, Zheng <zheng.z.yan@intel.com>2014-04-03 10:33:52 +0800
commit7cc69d42e6950404587bef9489a5ed6f9f6bab4e (patch)
tree42677df6cd502d33fac9ca97a4a929bb32f14176 /drivers/block
parentc647b8a8c6366f849c2a237bfe525cb1d316d5f4 (diff)
downloadop-kernel-dev-7cc69d42e6950404587bef9489a5ed6f9f6bab4e.zip
op-kernel-dev-7cc69d42e6950404587bef9489a5ed6f9f6bab4e.tar.gz
libceph: bump CEPH_OSD_MAX_OP to 3
Our longest osd request now contains 3 ops: copyup+hint+write. Also, CEPH_OSD_MAX_OP value in a BUG_ON in rbd_osd_req_callback() was hard-coded to 2. Fix it, and switch to rbd_assert while at it. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index b55b781..4c612c4 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1654,7 +1654,7 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
if (osd_req->r_result < 0)
obj_request->result = osd_req->r_result;
- BUG_ON(osd_req->r_num_ops > 2);
+ rbd_assert(osd_req->r_num_ops <= CEPH_OSD_MAX_OP);
/*
* We support a 64-bit length, but ultimately it has to be
OpenPOWER on IntegriCloud