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
916d4d67
Commit
916d4d67
authored
May 12, 2011
by
Sage Weil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rbd: cleanup: make kfree match kmalloc
Signed-off-by:
Sage Weil
<
sage@newdream.net
>
parent
13143d2d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
drivers/block/rbd.c
drivers/block/rbd.c
+7
-7
No files found.
drivers/block/rbd.c
View file @
916d4d67
...
@@ -1602,7 +1602,7 @@ static int rbd_header_add_snap(struct rbd_device *dev,
...
@@ -1602,7 +1602,7 @@ static int rbd_header_add_snap(struct rbd_device *dev,
int
name_len
=
strlen
(
snap_name
);
int
name_len
=
strlen
(
snap_name
);
u64
new_snapid
;
u64
new_snapid
;
int
ret
;
int
ret
;
void
*
data
,
*
data_start
,
*
data_end
;
void
*
data
,
*
p
,
*
e
;
u64
ver
;
u64
ver
;
/* we should create a snapshot only if we're pointing at the head */
/* we should create a snapshot only if we're pointing at the head */
...
@@ -1619,16 +1619,16 @@ static int rbd_header_add_snap(struct rbd_device *dev,
...
@@ -1619,16 +1619,16 @@ static int rbd_header_add_snap(struct rbd_device *dev,
if
(
!
data
)
if
(
!
data
)
return
-
ENOMEM
;
return
-
ENOMEM
;
data_start
=
data
;
p
=
data
;
data_end
=
data
+
name_len
+
16
;
e
=
data
+
name_len
+
16
;
ceph_encode_string_safe
(
&
data
,
data_end
,
snap_name
,
name_len
,
bad
);
ceph_encode_string_safe
(
&
p
,
e
,
snap_name
,
name_len
,
bad
);
ceph_encode_64_safe
(
&
data
,
data_end
,
new_snapid
,
bad
);
ceph_encode_64_safe
(
&
p
,
e
,
new_snapid
,
bad
);
ret
=
rbd_req_sync_exec
(
dev
,
dev
->
obj_md_name
,
"rbd"
,
"snap_add"
,
ret
=
rbd_req_sync_exec
(
dev
,
dev
->
obj_md_name
,
"rbd"
,
"snap_add"
,
data
_start
,
data
-
data_start
,
&
ver
);
data
,
p
-
data
,
&
ver
);
kfree
(
data
_start
);
kfree
(
data
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
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