2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index b55b7812cf93..4c612c4041b6 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
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index c42d1ada685f..94ec69672164 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -43,7 +43,7 @@ struct ceph_osd {
 };
 
 
-#define CEPH_OSD_MAX_OP 2
+#define CEPH_OSD_MAX_OP 3
 
 enum ceph_osd_data_type {
         CEPH_OSD_DATA_TYPE_NONE = 0,