libceph: osd_req_op_cls_init() doesn't need to take opcode (24639ce5) · Commits · 戴 / test

drivers/block/rbd.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2374,8 +2374,7 @@ static int rbd_obj_issue_copyup(struct rbd_obj_request *obj_req, u32 bytes)
		if (!obj_req->osd_req)
		return -ENOMEM;

		ret = osd_req_op_cls_init(obj_req->osd_req, 0, CEPH_OSD_OP_CALL, "rbd",
		"copyup");
		ret = osd_req_op_cls_init(obj_req->osd_req, 0, "rbd", "copyup");
		if (ret)
		return ret;

+2 −3

Original line number	Diff line number	Diff line
		@@ -444,8 +444,7 @@ extern void osd_req_op_cls_response_data_pages(struct ceph_osd_request *,
		struct page **pages, u64 length,
		u32 alignment, bool pages_from_pool,
		bool own_pages);
		extern int osd_req_op_cls_init(struct ceph_osd_request *osd_req,
		unsigned int which, u16 opcode,
		int osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
		const char class, const char method);
		extern int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
		u16 opcode, const char name, const void value,

+4 −5

Original line number	Diff line number	Diff line
		@@ -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);

		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,
		opcode, 0);
		struct ceph_osd_req_op *op;
		struct ceph_pagelist *pagelist;
		size_t payload_len = 0;
		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);
		if (!pagelist)
		@@ -4962,7 +4961,7 @@ int ceph_osdc_call(struct ceph_osd_client *osdc,
		if (ret)
		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)
		goto out_put_req;