Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
24639ce5
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24639ce5
编写于
9月 26, 2018
作者:
I
Ilya Dryomov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
libceph: osd_req_op_cls_init() doesn't need to take opcode
Signed-off-by:
N
Ilya Dryomov
<
idryomov@gmail.com
>
上级
94e6992b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
10 deletion
+7
-10
drivers/block/rbd.c
drivers/block/rbd.c
+1
-2
include/linux/ceph/osd_client.h
include/linux/ceph/osd_client.h
+2
-3
net/ceph/osd_client.c
net/ceph/osd_client.c
+4
-5
未找到文件。
drivers/block/rbd.c
浏览文件 @
24639ce5
...
...
@@ -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
;
...
...
include/linux/ceph/osd_client.h
浏览文件 @
24639ce5
...
...
@@ -444,9 +444,8 @@ 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
,
const
char
*
class
,
const
char
*
method
);
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
,
size_t
size
,
u8
cmp_op
,
u8
cmp_mode
);
...
...
net/ceph/osd_client.c
浏览文件 @
24639ce5
...
...
@@ -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
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录