On Sat, Aug 24, 2024 at 8:12 PM Simon Horman [off-list ref] wrote:
On Thu, Aug 22, 2024 at 09:39:04PM +0800, Li Zetao wrote:
quoted
When resolving name in ceph_dns_resolve_name(), the end address of name
is determined by the minimum value of delim_p and colon_p. So using min()
here is more in line with the context.
Signed-off-by: Li Zetao <redacted>
---
net/ceph/messenger.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 3c8b78d9c4d1..d1b5705dc0c6 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -1254,7 +1254,7 @@ static int ceph_dns_resolve_name(const char *name, size_t namelen,
colon_p = memchr(name, ':', namelen);
if (delim_p && colon_p)
- end = delim_p < colon_p ? delim_p : colon_p;
+ end = min(delim_p, colon_p);
Both delim_p, and colon_p are char *, so this seems correct to me.
And the code being replaced does appear to be a min() operation in
both form and function.
Reviewed-by: Simon Horman <horms@kernel.org>
However, I don't believe libceph changes usually don't go through next-next.
So I think this either needs to be reposted or get some acks from
one of the maintainers.
Ilya, Xiubo, perhaps you can offer some guidance here?
Hi Simon,
I'm OK with this being taken through net-next.
Acked-by: Ilya Dryomov <idryomov@gmail.com>
Thanks,
Ilya