Skip to content

Commit

Permalink
rbd: more symbol renames
Browse files Browse the repository at this point in the history 
Rename variables named "obj" which represent object names so they're
consistently named "object_name".

Rename the "cls" and "method" parameters in rbd_req_sync_exec()
to be "class_name" and "method_name", and make similar changes
to the names of local variables in that function representing
the lengths of those names.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
  • Loading branch information
Alex Elder authored and Sage Weil committed Jul 30, 2012
1 parent 0bed54d commit aded07e
Showing 1 changed file with 27 additions and 26 deletions.
53 changes: 27 additions & 26 deletions drivers/block/rbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ static int rbd_do_request(struct request *rq,
struct rbd_device *rbd_dev,
struct ceph_snap_context *snapc,
u64 snapid,
const char *obj, u64 ofs, u64 len,
const char *object_name, u64 ofs, u64 len,
struct bio *bio,
struct page **pages,
int num_pages,
Expand Down Expand Up @@ -894,7 +894,8 @@ static int rbd_do_request(struct request *rq,
req_data->coll_index = coll_index;
}

dout("rbd_do_request obj=%s ofs=%lld len=%lld\n", obj, len, ofs);
dout("rbd_do_request object_name=%s ofs=%lld len=%lld\n",
object_name, len, ofs);

down_read(&rbd_dev->header_rwsem);

Expand All @@ -919,7 +920,7 @@ static int rbd_do_request(struct request *rq,
reqhead = req->r_request->front.iov_base;
reqhead->snapid = cpu_to_le64(CEPH_NOSNAP);

strncpy(req->r_oid, obj, sizeof(req->r_oid));
strncpy(req->r_oid, object_name, sizeof(req->r_oid));
req->r_oid_len = strlen(req->r_oid);

layout = &req->r_file_layout;
Expand Down Expand Up @@ -1020,7 +1021,7 @@ static int rbd_req_sync_op(struct rbd_device *rbd_dev,
int flags,
struct ceph_osd_req_op *orig_ops,
int num_reply,
const char *obj,
const char *object_name,
u64 ofs, u64 len,
char *buf,
struct ceph_osd_request **linger_req,
Expand Down Expand Up @@ -1051,7 +1052,7 @@ static int rbd_req_sync_op(struct rbd_device *rbd_dev,
}

ret = rbd_do_request(NULL, rbd_dev, snapc, snapid,
obj, ofs, len, NULL,
object_name, ofs, len, NULL,
pages, num_pages,
flags,
ops,
Expand Down Expand Up @@ -1172,7 +1173,7 @@ static int rbd_req_read(struct request *rq,
static int rbd_req_sync_read(struct rbd_device *rbd_dev,
struct ceph_snap_context *snapc,
u64 snapid,
const char *obj,
const char *object_name,
u64 ofs, u64 len,
char *buf,
u64 *ver)
Expand All @@ -1182,7 +1183,7 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev,
CEPH_OSD_OP_READ,
CEPH_OSD_FLAG_READ,
NULL,
1, obj, ofs, len, buf, NULL, ver);
1, object_name, ofs, len, buf, NULL, ver);
}

/*
Expand All @@ -1191,7 +1192,7 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev,
static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
u64 ver,
u64 notify_id,
const char *obj)
const char *object_name)
{
struct ceph_osd_req_op *ops;
int ret;
Expand All @@ -1205,7 +1206,7 @@ static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
ops[0].watch.flag = 0;

ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP,
obj, 0, 0, NULL,
object_name, 0, 0, NULL,
NULL, 0,
CEPH_OSD_FLAG_READ,
ops,
Expand Down Expand Up @@ -1241,7 +1242,7 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
* Request sync osd watch
*/
static int rbd_req_sync_watch(struct rbd_device *rbd_dev,
const char *obj,
const char *object_name,
u64 ver)
{
struct ceph_osd_req_op *ops;
Expand All @@ -1265,7 +1266,7 @@ static int rbd_req_sync_watch(struct rbd_device *rbd_dev,
0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops,
1, obj, 0, 0, NULL,
1, object_name, 0, 0, NULL,
&rbd_dev->watch_request, NULL);

if (ret < 0)
Expand All @@ -1286,7 +1287,7 @@ static int rbd_req_sync_watch(struct rbd_device *rbd_dev,
* Request sync osd unwatch
*/
static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev,
const char *obj)
const char *object_name)
{
struct ceph_osd_req_op *ops;

Expand All @@ -1303,7 +1304,7 @@ static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev,
0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops,
1, obj, 0, 0, NULL, NULL, NULL);
1, object_name, 0, 0, NULL, NULL, NULL);

rbd_destroy_ops(ops);
ceph_osdc_cancel_event(rbd_dev->watch_event);
Expand All @@ -1330,7 +1331,7 @@ static void rbd_notify_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
* Request sync osd notify
*/
static int rbd_req_sync_notify(struct rbd_device *rbd_dev,
const char *obj)
const char *object_name)
{
struct ceph_osd_req_op *ops;
struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
Expand Down Expand Up @@ -1361,7 +1362,7 @@ static int rbd_req_sync_notify(struct rbd_device *rbd_dev,
0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops,
1, obj, 0, 0, NULL, NULL, NULL);
1, object_name, 0, 0, NULL, NULL, NULL);
if (ret < 0)
goto fail_event;

Expand All @@ -1381,25 +1382,25 @@ static int rbd_req_sync_notify(struct rbd_device *rbd_dev,
* Request sync osd read
*/
static int rbd_req_sync_exec(struct rbd_device *rbd_dev,
const char *obj,
const char *cls,
const char *method,
const char *object_name,
const char *class_name,
const char *method_name,
const char *data,
int len,
u64 *ver)
{
struct ceph_osd_req_op *ops;
int cls_len = strlen(cls);
int method_len = strlen(method);
int class_name_len = strlen(class_name);
int method_name_len = strlen(method_name);
int ret = rbd_create_rw_ops(&ops, 1, CEPH_OSD_OP_CALL,
cls_len + method_len + len);
class_name_len + method_name_len + len);
if (ret < 0)
return ret;

ops[0].cls.class_name = cls;
ops[0].cls.class_len = (__u8)cls_len;
ops[0].cls.method_name = method;
ops[0].cls.method_len = (__u8)method_len;
ops[0].cls.class_name = class_name;
ops[0].cls.class_len = (__u8) class_name_len;
ops[0].cls.method_name = method_name;
ops[0].cls.method_len = (__u8) method_name_len;
ops[0].cls.argc = 0;
ops[0].cls.indata = data;
ops[0].cls.indata_len = len;
Expand All @@ -1409,7 +1410,7 @@ static int rbd_req_sync_exec(struct rbd_device *rbd_dev,
0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops,
1, obj, 0, 0, NULL, NULL, ver);
1, object_name, 0, 0, NULL, NULL, ver);

rbd_destroy_ops(ops);

Expand Down

0 comments on commit aded07e

Please sign in to comment.