On 02/21/2014 12:55 PM, Ilya Dryomov wrote: > CEPH_OSD_MAX_OP value in rbd_osd_req_callback() is hard-coded to 2. > Fix it. Please squash this in with the previous patch (at least). Change the BUG_ON() to rbd_assert() while you're at it (and invert the logic). Reviewed-by: Alex Elder <elder@xxxxxxxxxx> > Signed-off-by: Ilya Dryomov <ilya.dryomov@xxxxxxxxxxx> > --- > drivers/block/rbd.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index b365e0dfccb6..48a889866824 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); > + BUG_ON(osd_req->r_num_ops > CEPH_OSD_MAX_OP); > > /* > * We support a 64-bit length, but ultimately it has to be > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
