diff options
author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-09 13:08:21 -0500 |
---|---|---|
committer | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-01-14 04:27:42 -0500 |
commit | 3f0a4ac55fe036902e3666be740da63528ad8639 (patch) | |
tree | a2ea56560e9f9bdedde7b8bf99f0be7855c15083 /net | |
parent | 3cea4c3071d4e55e9d7356efe9d0ebf92f0c2204 (diff) |
libceph: rename front to front_len in get_reply()
Rename front local variable to front_len in get_reply() to make its
purpose more clear.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/osd_client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 9f1993582ff7..7619c37bfed4 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -2502,7 +2502,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, | |||
2502 | struct ceph_osd_client *osdc = osd->o_osdc; | 2502 | struct ceph_osd_client *osdc = osd->o_osdc; |
2503 | struct ceph_msg *m; | 2503 | struct ceph_msg *m; |
2504 | struct ceph_osd_request *req; | 2504 | struct ceph_osd_request *req; |
2505 | int front = le32_to_cpu(hdr->front_len); | 2505 | int front_len = le32_to_cpu(hdr->front_len); |
2506 | int data_len = le32_to_cpu(hdr->data_len); | 2506 | int data_len = le32_to_cpu(hdr->data_len); |
2507 | u64 tid; | 2507 | u64 tid; |
2508 | 2508 | ||
@@ -2522,12 +2522,13 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, | |||
2522 | req->r_reply, req->r_reply->con); | 2522 | req->r_reply, req->r_reply->con); |
2523 | ceph_msg_revoke_incoming(req->r_reply); | 2523 | ceph_msg_revoke_incoming(req->r_reply); |
2524 | 2524 | ||
2525 | if (front > req->r_reply->front.iov_len) { | 2525 | if (front_len > req->r_reply->front.iov_len) { |
2526 | pr_warning("get_reply front %d > preallocated %d (%u#%llu)\n", | 2526 | pr_warning("get_reply front %d > preallocated %d (%u#%llu)\n", |
2527 | front, (int)req->r_reply->front.iov_len, | 2527 | front_len, (int)req->r_reply->front.iov_len, |
2528 | (unsigned int)con->peer_name.type, | 2528 | (unsigned int)con->peer_name.type, |
2529 | le64_to_cpu(con->peer_name.num)); | 2529 | le64_to_cpu(con->peer_name.num)); |
2530 | m = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, front, GFP_NOFS, false); | 2530 | m = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, front_len, GFP_NOFS, |
2531 | false); | ||
2531 | if (!m) | 2532 | if (!m) |
2532 | goto out; | 2533 | goto out; |
2533 | ceph_msg_put(req->r_reply); | 2534 | ceph_msg_put(req->r_reply); |