leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libceph: bump CEPH_OSD_MAX_OP to 3

Browse Source 
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>
This commit is contained in:
Ilya Dryomov 2014-02-25 16:22:27 +02:00 committed by Yan, Zheng
parent c647b8a8c6
commit 7cc69d42e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/rbd.c
View File

@ -1654,7 +1654,7 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
if (osd_req->r_result < 0) if (osd_req->r_result < 0)
obj_request->result = osd_req->r_result; 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 * We support a 64-bit length, but ultimately it has to be

2
include/linux/ceph/osd_client.h
View File

@ -43,7 +43,7 @@ struct ceph_osd {
}; };
#define CEPH_OSD_MAX_OP 2 #define CEPH_OSD_MAX_OP 3
enum ceph_osd_data_type { enum ceph_osd_data_type {
CEPH_OSD_DATA_TYPE_NONE = 0, CEPH_OSD_DATA_TYPE_NONE = 0,