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

rbd: more symbol renames 

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>
This commit is contained in:
Alex Elder 2012-07-03 16:01:18 -05:00 committed by Sage Weil
parent 0bed54dc9a
commit aded07ea9f
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/block/rbd.c
View File

@ -858,7 +858,7 @@ static int rbd_do_request(struct request *rq,
struct rbd_device *rbd_dev, struct rbd_device *rbd_dev,
struct ceph_snap_context *snapc, struct ceph_snap_context *snapc,
u64 snapid, u64 snapid,
const char *obj, u64 ofs, u64 len, const char *object_name, u64 ofs, u64 len,
struct bio *bio, struct bio *bio,
struct page **pages, struct page **pages,
int num_pages, int num_pages,
@ -894,7 +894,8 @@ static int rbd_do_request(struct request *rq,
req_data->coll_index = coll_index; 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); down_read(&rbd_dev->header_rwsem);
@ -919,7 +920,7 @@ static int rbd_do_request(struct request *rq,
reqhead = req->r_request->front.iov_base; reqhead = req->r_request->front.iov_base;
reqhead->snapid = cpu_to_le64(CEPH_NOSNAP); 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); req->r_oid_len = strlen(req->r_oid);
layout = &req->r_file_layout; layout = &req->r_file_layout;
@ -1020,7 +1021,7 @@ static int rbd_req_sync_op(struct rbd_device *rbd_dev,
int flags, int flags,
struct ceph_osd_req_op *orig_ops, struct ceph_osd_req_op *orig_ops,
int num_reply, int num_reply,
const char *obj, const char *object_name,
u64 ofs, u64 len, u64 ofs, u64 len,
char *buf, char *buf,
struct ceph_osd_request **linger_req, struct ceph_osd_request **linger_req,
@ -1051,7 +1052,7 @@ static int rbd_req_sync_op(struct rbd_device *rbd_dev,
} }
ret = rbd_do_request(NULL, rbd_dev, snapc, snapid, ret = rbd_do_request(NULL, rbd_dev, snapc, snapid,
obj, ofs, len, NULL, object_name, ofs, len, NULL,
pages, num_pages, pages, num_pages,
flags, flags,
ops, ops,
@ -1172,7 +1173,7 @@ static int rbd_req_read(struct request *rq,
static int rbd_req_sync_read(struct rbd_device *rbd_dev, static int rbd_req_sync_read(struct rbd_device *rbd_dev,
struct ceph_snap_context *snapc, struct ceph_snap_context *snapc,
u64 snapid, u64 snapid,
const char *obj, const char *object_name,
u64 ofs, u64 len, u64 ofs, u64 len,
char *buf, char *buf,
u64 *ver) u64 *ver)
@ -1182,7 +1183,7 @@ static int rbd_req_sync_read(struct rbd_device *rbd_dev,
CEPH_OSD_OP_READ, CEPH_OSD_OP_READ,
CEPH_OSD_FLAG_READ, CEPH_OSD_FLAG_READ,
NULL, NULL,
1, obj, ofs, len, buf, NULL, ver); 1, object_name, ofs, len, buf, NULL, ver);
} }
/* /*
@ -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, static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
u64 ver, u64 ver,
u64 notify_id, u64 notify_id,
const char *obj) const char *object_name)
{ {
struct ceph_osd_req_op *ops; struct ceph_osd_req_op *ops;
int ret; int ret;
@ -1205,7 +1206,7 @@ static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
ops[0].watch.flag = 0; ops[0].watch.flag = 0;
ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP, ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP,
obj, 0, 0, NULL, object_name, 0, 0, NULL,
NULL, 0, NULL, 0,
CEPH_OSD_FLAG_READ, CEPH_OSD_FLAG_READ,
ops, ops,
@ -1241,7 +1242,7 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
* Request sync osd watch * Request sync osd watch
*/ */
static int rbd_req_sync_watch(struct rbd_device *rbd_dev, static int rbd_req_sync_watch(struct rbd_device *rbd_dev,
const char *obj, const char *object_name,
u64 ver) u64 ver)
{ {
struct ceph_osd_req_op *ops; struct ceph_osd_req_op *ops;
@ -1265,7 +1266,7 @@ static int rbd_req_sync_watch(struct rbd_device *rbd_dev,
0, 0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops, ops,
1, obj, 0, 0, NULL, 1, object_name, 0, 0, NULL,
&rbd_dev->watch_request, NULL); &rbd_dev->watch_request, NULL);
if (ret < 0) if (ret < 0)
@ -1286,7 +1287,7 @@ fail:
* Request sync osd unwatch * Request sync osd unwatch
*/ */
static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev, static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev,
const char *obj) const char *object_name)
{ {
struct ceph_osd_req_op *ops; struct ceph_osd_req_op *ops;
@ -1303,7 +1304,7 @@ static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev,
0, 0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops, ops,
1, obj, 0, 0, NULL, NULL, NULL); 1, object_name, 0, 0, NULL, NULL, NULL);
rbd_destroy_ops(ops); rbd_destroy_ops(ops);
ceph_osdc_cancel_event(rbd_dev->watch_event); ceph_osdc_cancel_event(rbd_dev->watch_event);
@ -1330,7 +1331,7 @@ static void rbd_notify_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
* Request sync osd notify * Request sync osd notify
*/ */
static int rbd_req_sync_notify(struct rbd_device *rbd_dev, 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_req_op *ops;
struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc;
@ -1361,7 +1362,7 @@ static int rbd_req_sync_notify(struct rbd_device *rbd_dev,
0, 0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops, ops,
1, obj, 0, 0, NULL, NULL, NULL); 1, object_name, 0, 0, NULL, NULL, NULL);
if (ret < 0) if (ret < 0)
goto fail_event; goto fail_event;
@ -1381,25 +1382,25 @@ fail:
* Request sync osd read * Request sync osd read
*/ */
static int rbd_req_sync_exec(struct rbd_device *rbd_dev, static int rbd_req_sync_exec(struct rbd_device *rbd_dev,
const char *obj, const char *object_name,
const char *cls, const char *class_name,
const char *method, const char *method_name,
const char *data, const char *data,
int len, int len,
u64 *ver) u64 *ver)
{ {
struct ceph_osd_req_op *ops; struct ceph_osd_req_op *ops;
int cls_len = strlen(cls); int class_name_len = strlen(class_name);
int method_len = strlen(method); int method_name_len = strlen(method_name);
int ret = rbd_create_rw_ops(&ops, 1, CEPH_OSD_OP_CALL, 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) if (ret < 0)
return ret; return ret;
ops[0].cls.class_name = cls; ops[0].cls.class_name = class_name;
ops[0].cls.class_len = (__u8)cls_len; ops[0].cls.class_len = (__u8) class_name_len;
ops[0].cls.method_name = method; ops[0].cls.method_name = method_name;
ops[0].cls.method_len = (__u8)method_len; ops[0].cls.method_len = (__u8) method_name_len;
ops[0].cls.argc = 0; ops[0].cls.argc = 0;
ops[0].cls.indata = data; ops[0].cls.indata = data;
ops[0].cls.indata_len = len; ops[0].cls.indata_len = len;
@ -1409,7 +1410,7 @@ static int rbd_req_sync_exec(struct rbd_device *rbd_dev,
0, 0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops, ops,
1, obj, 0, 0, NULL, NULL, ver); 1, object_name, 0, 0, NULL, NULL, ver);
rbd_destroy_ops(ops); rbd_destroy_ops(ops);