Commit 916d4d67 authored by Sage Weil's avatar Sage Weil

rbd: cleanup: make kfree match kmalloc

Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 13143d2d
...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment