hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: void data pointers for rbd_obj_method_sync() 

Make the inbound and outbound data parameters have void rather than
character type for rbd_obj_method_sync().  This makes it more clear
they don't expect typed data, and eliminates the need for some silly
type casts.

One more unrelated change: define the features buffer used in
_rbd_dev_v2_snap_features() to be a packed data structure.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-04-21 12:14:45 -05:00 committed by Sage Weil
parent 80ef15bf71
commit 4157976b27
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/block/rbd.c
View File

@ -2623,9 +2623,9 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev,
const char *object_name, const char *object_name,
const char *class_name, const char *class_name,
const char *method_name, const char *method_name,
const char *outbound, const void *outbound,
size_t outbound_size, size_t outbound_size,
char *inbound, void *inbound,
size_t inbound_size, size_t inbound_size,
u64 *version) u64 *version)
{ {
@ -3578,8 +3578,8 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,
ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name, ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
"rbd", "get_size", "rbd", "get_size",
(char *) &snapid, sizeof (snapid), &snapid, sizeof (snapid),
(char *) &size_buf, sizeof (size_buf), NULL); &size_buf, sizeof (size_buf), NULL);
dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -3612,8 +3612,7 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev)
return -ENOMEM; return -ENOMEM;
ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name, ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
"rbd", "get_object_prefix", "rbd", "get_object_prefix", NULL, 0,
NULL, 0,
reply_buf, RBD_OBJ_PREFIX_LEN_MAX, NULL); reply_buf, RBD_OBJ_PREFIX_LEN_MAX, NULL);
dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
@ -3644,15 +3643,14 @@ static int _rbd_dev_v2_snap_features(struct rbd_device *rbd_dev, u64 snap_id,
struct { struct {
__le64 features; __le64 features;
__le64 incompat; __le64 incompat;
} features_buf = { 0 }; } __attribute__ ((packed)) features_buf = { 0 };
u64 incompat; u64 incompat;
int ret; int ret;
ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name, ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
"rbd", "get_features", "rbd", "get_features",
(char *) &snapid, sizeof (snapid), &snapid, sizeof (snapid),
(char *) &features_buf, sizeof (features_buf), &features_buf, sizeof (features_buf), NULL);
NULL);
dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -3706,15 +3704,15 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
snapid = cpu_to_le64(CEPH_NOSNAP); snapid = cpu_to_le64(CEPH_NOSNAP);
ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name, ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
"rbd", "get_parent", "rbd", "get_parent",
(char *) &snapid, sizeof (snapid), &snapid, sizeof (snapid),
(char *) reply_buf, size, NULL); reply_buf, size, NULL);
dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
goto out_err; goto out_err;
ret = -ERANGE; ret = -ERANGE;
p = reply_buf; p = reply_buf;
end = (char *) reply_buf + size; end = reply_buf + size;
ceph_decode_64_safe(&p, end, parent_spec->pool_id, out_err); ceph_decode_64_safe(&p, end, parent_spec->pool_id, out_err);
if (parent_spec->pool_id == CEPH_NOPOOL) if (parent_spec->pool_id == CEPH_NOPOOL)
goto out; /* No parent? No problem. */ goto out; /* No parent? No problem. */
@ -3767,7 +3765,7 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)
return NULL; return NULL;
p = image_id; p = image_id;
end = (char *) image_id + image_id_size; end = image_id + image_id_size;
ceph_encode_string(&p, end, rbd_dev->spec->image_id, (u32) len); ceph_encode_string(&p, end, rbd_dev->spec->image_id, (u32) len);
size = sizeof (__le32) + RBD_IMAGE_NAME_LEN_MAX; size = sizeof (__le32) + RBD_IMAGE_NAME_LEN_MAX;
@ -3778,11 +3776,11 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)
ret = rbd_obj_method_sync(rbd_dev, RBD_DIRECTORY, ret = rbd_obj_method_sync(rbd_dev, RBD_DIRECTORY,
"rbd", "dir_get_name", "rbd", "dir_get_name",
image_id, image_id_size, image_id, image_id_size,
(char *) reply_buf, size, NULL); reply_buf, size, NULL);
if (ret < 0) if (ret < 0)
goto out; goto out;
p = reply_buf; p = reply_buf;
end = (char *) reply_buf + size; end = reply_buf + size;
image_name = ceph_extract_encoded_string(&p, end, &len, GFP_KERNEL); image_name = ceph_extract_encoded_string(&p, end, &len, GFP_KERNEL);
if (IS_ERR(image_name)) if (IS_ERR(image_name))
image_name = NULL; image_name = NULL;
@ -3831,7 +3829,7 @@ static int rbd_dev_probe_update_spec(struct rbd_device *rbd_dev)
name = rbd_dev_image_name(rbd_dev); name = rbd_dev_image_name(rbd_dev);
if (name) if (name)
rbd_dev->spec->image_name = (char *) name; rbd_dev->spec->image_name = (char *)name;
else else
rbd_warn(rbd_dev, "unable to get image name"); rbd_warn(rbd_dev, "unable to get image name");
@ -3882,8 +3880,7 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev, u64 *ver)
return -ENOMEM; return -ENOMEM;
ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name, ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
"rbd", "get_snapcontext", "rbd", "get_snapcontext", NULL, 0,
NULL, 0,
reply_buf, size, ver); reply_buf, size, ver);
dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
@ -3891,7 +3888,7 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev, u64 *ver)
ret = -ERANGE; ret = -ERANGE;
p = reply_buf; p = reply_buf;
end = (char *) reply_buf + size; end = reply_buf + size;
ceph_decode_64_safe(&p, end, seq, out); ceph_decode_64_safe(&p, end, seq, out);
ceph_decode_32_safe(&p, end, snap_count, out); ceph_decode_32_safe(&p, end, snap_count, out);
@ -3952,14 +3949,14 @@ static char *rbd_dev_v2_snap_name(struct rbd_device *rbd_dev, u32 which)
snap_id = cpu_to_le64(rbd_dev->header.snapc->snaps[which]); snap_id = cpu_to_le64(rbd_dev->header.snapc->snaps[which]);
ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name, ret = rbd_obj_method_sync(rbd_dev, rbd_dev->header_name,
"rbd", "get_snapshot_name", "rbd", "get_snapshot_name",
(char *) &snap_id, sizeof (snap_id), &snap_id, sizeof (snap_id),
reply_buf, size, NULL); reply_buf, size, NULL);
dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)
goto out; goto out;
p = reply_buf; p = reply_buf;
end = (char *) reply_buf + size; end = reply_buf + size;
snap_name = ceph_extract_encoded_string(&p, end, NULL, GFP_KERNEL); snap_name = ceph_extract_encoded_string(&p, end, NULL, GFP_KERNEL);
if (IS_ERR(snap_name)) { if (IS_ERR(snap_name)) {
ret = PTR_ERR(snap_name); ret = PTR_ERR(snap_name);
@ -4555,8 +4552,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
} }
ret = rbd_obj_method_sync(rbd_dev, object_name, ret = rbd_obj_method_sync(rbd_dev, object_name,
"rbd", "get_id", "rbd", "get_id", NULL, 0,
NULL, 0,
response, RBD_IMAGE_ID_LEN_MAX, NULL); response, RBD_IMAGE_ID_LEN_MAX, NULL);
dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret); dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
if (ret < 0) if (ret < 0)