Commit 488dbde3 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Ben Hutchings

libceph: rename ceph_msg::front_max to front_alloc_len

commit 3cea4c30 upstream.

Rename front_max field of struct ceph_msg to front_alloc_len to make
its purpose more clear.
Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent babe91ef
...@@ -92,7 +92,7 @@ struct ceph_msg { ...@@ -92,7 +92,7 @@ struct ceph_msg {
bool front_is_vmalloc; bool front_is_vmalloc;
bool more_to_follow; bool more_to_follow;
bool needs_out_seq; bool needs_out_seq;
int front_max; int front_alloc_len;
unsigned long ack_stamp; /* tx: when we were acked */ unsigned long ack_stamp; /* tx: when we were acked */
struct ceph_msgpool *pool; struct ceph_msgpool *pool;
......
...@@ -2423,7 +2423,7 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags, ...@@ -2423,7 +2423,7 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
m->footer.middle_crc = 0; m->footer.middle_crc = 0;
m->footer.data_crc = 0; m->footer.data_crc = 0;
m->footer.flags = 0; m->footer.flags = 0;
m->front_max = front_len; m->front_alloc_len = front_len;
m->front_is_vmalloc = false; m->front_is_vmalloc = false;
m->more_to_follow = false; m->more_to_follow = false;
m->ack_stamp = 0; m->ack_stamp = 0;
...@@ -2594,8 +2594,8 @@ EXPORT_SYMBOL(ceph_msg_last_put); ...@@ -2594,8 +2594,8 @@ EXPORT_SYMBOL(ceph_msg_last_put);
void ceph_msg_dump(struct ceph_msg *msg) void ceph_msg_dump(struct ceph_msg *msg)
{ {
pr_debug("msg_dump %p (front_max %d nr_pages %d)\n", msg, pr_debug("msg_dump %p (front_alloc_len %d nr_pages %d)\n", msg,
msg->front_max, msg->nr_pages); msg->front_alloc_len, msg->nr_pages);
print_hex_dump(KERN_DEBUG, "header: ", print_hex_dump(KERN_DEBUG, "header: ",
DUMP_PREFIX_OFFSET, 16, 1, DUMP_PREFIX_OFFSET, 16, 1,
&msg->hdr, sizeof(msg->hdr), true); &msg->hdr, sizeof(msg->hdr), true);
......
...@@ -150,7 +150,7 @@ static int __open_session(struct ceph_mon_client *monc) ...@@ -150,7 +150,7 @@ static int __open_session(struct ceph_mon_client *monc)
/* initiatiate authentication handshake */ /* initiatiate authentication handshake */
ret = ceph_auth_build_hello(monc->auth, ret = ceph_auth_build_hello(monc->auth,
monc->m_auth->front.iov_base, monc->m_auth->front.iov_base,
monc->m_auth->front_max); monc->m_auth->front_alloc_len);
__send_prepared_auth_request(monc, ret); __send_prepared_auth_request(monc, ret);
} else { } else {
dout("open_session mon%d already open\n", monc->cur_mon); dout("open_session mon%d already open\n", monc->cur_mon);
...@@ -194,7 +194,7 @@ static void __send_subscribe(struct ceph_mon_client *monc) ...@@ -194,7 +194,7 @@ static void __send_subscribe(struct ceph_mon_client *monc)
int num; int num;
p = msg->front.iov_base; p = msg->front.iov_base;
end = p + msg->front_max; end = p + msg->front_alloc_len;
num = 1 + !!monc->want_next_osdmap + !!monc->want_mdsmap; num = 1 + !!monc->want_next_osdmap + !!monc->want_mdsmap;
ceph_encode_32(&p, num); ceph_encode_32(&p, num);
...@@ -860,7 +860,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc, ...@@ -860,7 +860,7 @@ static void handle_auth_reply(struct ceph_mon_client *monc,
ret = ceph_handle_auth_reply(monc->auth, msg->front.iov_base, ret = ceph_handle_auth_reply(monc->auth, msg->front.iov_base,
msg->front.iov_len, msg->front.iov_len,
monc->m_auth->front.iov_base, monc->m_auth->front.iov_base,
monc->m_auth->front_max); monc->m_auth->front_alloc_len);
if (ret < 0) { if (ret < 0) {
monc->client->auth_err = ret; monc->client->auth_err = ret;
wake_up_all(&monc->client->auth_wq); wake_up_all(&monc->client->auth_wq);
...@@ -887,7 +887,7 @@ static int __validate_auth(struct ceph_mon_client *monc) ...@@ -887,7 +887,7 @@ static int __validate_auth(struct ceph_mon_client *monc)
return 0; return 0;
ret = ceph_build_auth(monc->auth, monc->m_auth->front.iov_base, ret = ceph_build_auth(monc->auth, monc->m_auth->front.iov_base,
monc->m_auth->front_max); monc->m_auth->front_alloc_len);
if (ret <= 0) if (ret <= 0)
return ret; /* either an error, or no need to authenticate */ return ret; /* either an error, or no need to authenticate */
__send_prepared_auth_request(monc, ret); __send_prepared_auth_request(monc, 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