Re: [PATCH net-next 8/8] SUNRPC: use min() to simplify the code

From
Chuck Lever <hidden>
Date
2024-08-24 18:22:56
Also in
ceph-devel, linux-bluetooth, linux-nfs
Reply to
Simon Horman, 2024-08-24
On Sat, Aug 24, 2024 at 07:07:50PM +0100, Simon Horman wrote:
On Thu, Aug 22, 2024 at 09:39:08PM +0800, Li Zetao wrote:
quoted
When reading pages in xdr_read_pages, the number of XDR encoded bytes
should be less than the len of aligned pages, so using min() here is
very semantic.

Signed-off-by: Li Zetao <redacted>
---
 net/sunrpc/xdr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 62e07c330a66..6746e920dbbb 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -1602,7 +1602,7 @@ unsigned int xdr_read_pages(struct xdr_stream *xdr, unsigned int len)
 	end = xdr_stream_remaining(xdr) - pglen;
 
 	xdr_set_tail_base(xdr, base, end);
-	return len <= pglen ? len : pglen;
+	return min(len, pglen);
Both len and pglen are unsigned int, 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 SUNRPC changes usually don't go through next-next.
So I think this either needs to be reposted or get some acks from
Chuck Lever (already CCed).

Chuck, perhaps you can offer some guidance here?
quoted
 }
 EXPORT_SYMBOL_GPL(xdr_read_pages);
 
-- 
2.34.1
Changes to net/sunrpc/ can go through Anna and Trond's NFS client
trees, through the NFSD tree, or via netdev, but they are typically
taken through the NFS-related trees.

Unless the submitter or the relevant maintainers prefer otherwise,
I don't see a problem with this one going through netdev. Let me
know otherwise.

Acked-by: Chuck Lever <redacted>


-- 
Chuck Lever
Thread (25 messages) 25 messages, 9 authors, last reply 2024-09-12
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help