diff options
author | Jeff Layton <jlayton@kernel.org> | 2019-06-17 09:24:31 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2019-07-08 08:01:43 -0400 |
commit | 2c66de560fa2dda0a600e908897116914db8f500 (patch) | |
tree | 852917a94ebb223177d1632f774e4cd8acaff3e5 /net/ceph | |
parent | d3c3c0a841d5dafc5395be363996d619255a732f (diff) |
libceph: rename ceph_encode_addr to ceph_encode_banner_addr
...ditto for the decode function. We only use these functions to fix
up banner addresses now, so let's name them more appropriately.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net/ceph')
-rw-r--r-- | net/ceph/messenger.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 0a3ef33cf7ac..0473d9a7b1f4 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c | |||
@@ -222,7 +222,7 @@ EXPORT_SYMBOL(ceph_pr_addr); | |||
222 | static void encode_my_addr(struct ceph_messenger *msgr) | 222 | static void encode_my_addr(struct ceph_messenger *msgr) |
223 | { | 223 | { |
224 | memcpy(&msgr->my_enc_addr, &msgr->inst.addr, sizeof(msgr->my_enc_addr)); | 224 | memcpy(&msgr->my_enc_addr, &msgr->inst.addr, sizeof(msgr->my_enc_addr)); |
225 | ceph_encode_addr(&msgr->my_enc_addr); | 225 | ceph_encode_banner_addr(&msgr->my_enc_addr); |
226 | } | 226 | } |
227 | 227 | ||
228 | /* | 228 | /* |
@@ -1734,14 +1734,14 @@ static int read_partial_banner(struct ceph_connection *con) | |||
1734 | ret = read_partial(con, end, size, &con->actual_peer_addr); | 1734 | ret = read_partial(con, end, size, &con->actual_peer_addr); |
1735 | if (ret <= 0) | 1735 | if (ret <= 0) |
1736 | goto out; | 1736 | goto out; |
1737 | ceph_decode_addr(&con->actual_peer_addr); | 1737 | ceph_decode_banner_addr(&con->actual_peer_addr); |
1738 | 1738 | ||
1739 | size = sizeof (con->peer_addr_for_me); | 1739 | size = sizeof (con->peer_addr_for_me); |
1740 | end += size; | 1740 | end += size; |
1741 | ret = read_partial(con, end, size, &con->peer_addr_for_me); | 1741 | ret = read_partial(con, end, size, &con->peer_addr_for_me); |
1742 | if (ret <= 0) | 1742 | if (ret <= 0) |
1743 | goto out; | 1743 | goto out; |
1744 | ceph_decode_addr(&con->peer_addr_for_me); | 1744 | ceph_decode_banner_addr(&con->peer_addr_for_me); |
1745 | 1745 | ||
1746 | out: | 1746 | out: |
1747 | return ret; | 1747 | return ret; |