summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2017-02-11 18:48:41 +0100
committerIlya Dryomov <idryomov@gmail.com>2017-02-24 19:04:57 +0100
commit54ea0046b6fe36ec18e82d282a29a18da6cdea0f (patch)
treed75b70f1d6a235ebd79eaf0e5986eec77ec35403 /drivers
parentb18b9550e4059ceea0393c518eb323b95243f92f (diff)
downloadlinux-54ea0046b6fe36ec18e82d282a29a18da6cdea0f.tar.gz
linux-54ea0046b6fe36ec18e82d282a29a18da6cdea0f.tar.xz
libceph, rbd, ceph: WRITE | ONDISK -> WRITE
CEPH_OSD_FLAG_ONDISK is set in account_request(). Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/rbd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index ffb8d3afc6b4..695ef552aaf0 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1981,8 +1981,7 @@ static struct ceph_osd_request *rbd_osd_req_create(
return __rbd_osd_req_create(rbd_dev, snapc, num_ops,
(op_type == OBJ_OP_WRITE || op_type == OBJ_OP_DISCARD) ?
- CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK : CEPH_OSD_FLAG_READ,
- obj_request);
+ CEPH_OSD_FLAG_WRITE : CEPH_OSD_FLAG_READ, obj_request);
}
/*
@@ -2008,8 +2007,7 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request)
return __rbd_osd_req_create(img_request->rbd_dev,
img_request->snapc, num_osd_ops,
- CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
- obj_request);
+ CEPH_OSD_FLAG_WRITE, obj_request);
}
static void rbd_osd_req_destroy(struct ceph_osd_request *osd_req)