Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
24639ce5
Commit
24639ce5
authored
Sep 26, 2018
by
Ilya Dryomov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libceph: osd_req_op_cls_init() doesn't need to take opcode
Signed-off-by:
Ilya Dryomov
<
idryomov@gmail.com
>
parent
94e6992b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
10 deletions
+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
No files found.
drivers/block/rbd.c
View file @
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
View file @
24639ce5
...
...
@@ -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
,
...
...
net/ceph/osd_client.c
View file @
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment