summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2019-06-19 16:45:27 +0300
committerIlya Dryomov <idryomov@gmail.com>2019-07-08 15:01:45 +0300
commit8b5bec5c83e8e319d5ecb4efcbf04bdef85409e6 (patch)
treee46c59f3e901ec120771415c19a0975553a1b53b /drivers/block
parent22e8bd51bb0469d1a524130a057f894ff632376a (diff)
downloadlinux-8b5bec5c83e8e319d5ecb4efcbf04bdef85409e6.tar.xz
rbd: setallochint only if object doesn't exist
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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 0df91665c4eb..a3d49fbaffea 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -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;
u16 opcode;
- osd_req_op_alloc_hint_init(osd_req, which++,
- rbd_dev->layout.object_size,
- rbd_dev->layout.object_size);
+ if (!use_object_map(rbd_dev) ||
+ !(obj_req->flags & RBD_OBJ_FLAG_MAY_EXIST)) {
+ 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))
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)
{
- 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:
- 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:
return 1; /* delete/truncate/zero */
case OBJ_OP_ZEROOUT: