openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libceph: osd_req_op_cls_init() doesn't need to take opcode 

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2018-09-26 19:12:07 +02:00
parent 94e6992bb5
commit 24639ce560
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/rbd.c
View File

@ -2374,8 +2374,7 @@ static int rbd_obj_issue_copyup(struct rbd_obj_request *obj_req, u32 bytes)
if (!obj_req->osd_req) if (!obj_req->osd_req)
return -ENOMEM; return -ENOMEM;
ret = osd_req_op_cls_init(obj_req->osd_req, 0, CEPH_OSD_OP_CALL, "rbd", ret = osd_req_op_cls_init(obj_req->osd_req, 0, "rbd", "copyup");
"copyup");
if (ret) if (ret)
return ret; return ret;

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

@ -444,9 +444,8 @@ extern void osd_req_op_cls_response_data_pages(struct ceph_osd_request *,
struct page **pages, u64 length, struct page **pages, u64 length,
u32 alignment, bool pages_from_pool, u32 alignment, bool pages_from_pool,
bool own_pages); bool own_pages);
extern int osd_req_op_cls_init(struct ceph_osd_request *osd_req, int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
unsigned int which, u16 opcode, const char *class, const char *method);
const char *class, const char *method);
extern int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which, extern int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
u16 opcode, const char *name, const void *value, u16 opcode, const char *name, const void *value,
size_t size, u8 cmp_op, u8 cmp_mode); size_t size, u8 cmp_op, u8 cmp_mode);

9
net/ceph/osd_client.c
View File

@ -767,15 +767,14 @@ void osd_req_op_extent_dup_last(struct ceph_osd_request *osd_req,
EXPORT_SYMBOL(osd_req_op_extent_dup_last); EXPORT_SYMBOL(osd_req_op_extent_dup_last);
int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which, int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
u16 opcode, const char *class, const char *method) const char *class, const char *method)
{ {
struct ceph_osd_req_op *op = _osd_req_op_init(osd_req, which, struct ceph_osd_req_op *op;
opcode, 0);
struct ceph_pagelist *pagelist; struct ceph_pagelist *pagelist;
size_t payload_len = 0; size_t payload_len = 0;
size_t size; size_t size;
BUG_ON(opcode != CEPH_OSD_OP_CALL); op = _osd_req_op_init(osd_req, which, CEPH_OSD_OP_CALL, 0);
pagelist = kmalloc(sizeof (*pagelist), GFP_NOFS); pagelist = kmalloc(sizeof (*pagelist), GFP_NOFS);
if (!pagelist) if (!pagelist)
@ -4962,7 +4961,7 @@ int ceph_osdc_call(struct ceph_osd_client *osdc,
if (ret) if (ret)
goto out_put_req; goto out_put_req;
ret = osd_req_op_cls_init(req, 0, CEPH_OSD_OP_CALL, class, method); ret = osd_req_op_cls_init(req, 0, class, method);
if (ret) if (ret)
goto out_put_req; goto out_put_req;