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

rbd: setallochint only if object doesn't exist

Browse Source 
setallochint is really only useful on object creation.  Continue
hinting unconditionally if object map cannot be used.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
This commit is contained in:
Ilya Dryomov 2019-06-19 15:45:27 +02:00
parent 22e8bd51bb
commit 8b5bec5c83
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/block/rbd.c
View File

@ -2365,9 +2365,12 @@ static void __rbd_osd_setup_write_ops(struct ceph_osd_request *osd_req,
struct rbd_device *rbd_dev = obj_req->img_request->rbd_dev; struct rbd_device *rbd_dev = obj_req->img_request->rbd_dev;
u16 opcode; u16 opcode;
osd_req_op_alloc_hint_init(osd_req, which++, if (!use_object_map(rbd_dev) ||
rbd_dev->layout.object_size, !(obj_req->flags & RBD_OBJ_FLAG_MAY_EXIST)) {
rbd_dev->layout.object_size); osd_req_op_alloc_hint_init(osd_req, which++,
rbd_dev->layout.object_size,
rbd_dev->layout.object_size);
}
if (rbd_obj_is_entire(obj_req)) if (rbd_obj_is_entire(obj_req))
opcode = CEPH_OSD_OP_WRITEFULL; opcode = CEPH_OSD_OP_WRITEFULL;
@ -2510,9 +2513,15 @@ static int rbd_obj_init_zeroout(struct rbd_obj_request *obj_req)
static int count_write_ops(struct rbd_obj_request *obj_req) static int count_write_ops(struct rbd_obj_request *obj_req)
{ {
switch (obj_req->img_request->op_type) { struct rbd_img_request *img_req = obj_req->img_request;
switch (img_req->op_type) {
case OBJ_OP_WRITE: case OBJ_OP_WRITE:
return 2; /* setallochint + write/writefull */ if (!use_object_map(img_req->rbd_dev) ||
!(obj_req->flags & RBD_OBJ_FLAG_MAY_EXIST))
return 2; /* setallochint + write/writefull */
return 1; /* write/writefull */
case OBJ_OP_DISCARD: case OBJ_OP_DISCARD:
return 1; /* delete/truncate/zero */ return 1; /* delete/truncate/zero */
case OBJ_OP_ZEROOUT: case OBJ_OP_ZEROOUT: