summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorJeff Layton <jlayton@kernel.org>2019-06-17 15:24:31 +0200
committerIlya Dryomov <idryomov@gmail.com>2019-07-08 14:01:43 +0200
commit2c66de560fa2dda0a600e908897116914db8f500 (patch)
tree852917a94ebb223177d1632f774e4cd8acaff3e5 /net/ceph
parentlibceph: use TYPE_LEGACY for entity addrs instead of TYPE_NONE (diff)
downloadlinux-2c66de560fa2dda0a600e908897116914db8f500.tar.xz
linux-2c66de560fa2dda0a600e908897116914db8f500.zip
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.c6
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);
static void encode_my_addr(struct ceph_messenger *msgr)
{
memcpy(&msgr->my_enc_addr, &msgr->inst.addr, sizeof(msgr->my_enc_addr));
- ceph_encode_addr(&msgr->my_enc_addr);
+ ceph_encode_banner_addr(&msgr->my_enc_addr);
}
/*
@@ -1734,14 +1734,14 @@ static int read_partial_banner(struct ceph_connection *con)
ret = read_partial(con, end, size, &con->actual_peer_addr);
if (ret <= 0)
goto out;
- ceph_decode_addr(&con->actual_peer_addr);
+ ceph_decode_banner_addr(&con->actual_peer_addr);
size = sizeof (con->peer_addr_for_me);
end += size;
ret = read_partial(con, end, size, &con->peer_addr_for_me);
if (ret <= 0)
goto out;
- ceph_decode_addr(&con->peer_addr_for_me);
+ ceph_decode_banner_addr(&con->peer_addr_for_me);
out:
return ret;