On Wed, 2025-02-05 at 08:43 -0500, Jeff Layton wrote: > The output format should provide a value that matches the one in > the /proc/<pid>/ns/net symlink. This makes it simpler to match the > rpc_xprt and rpc_clnt to a particular container. > > Also, when the xprt defines the get_srcaddr operation, use that to > display the source address as well. > > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> > --- > Changes in v2: > - Don't bother with NUL termination, just use a length specifier > - Link to v1: https://lore.kernel.org/r/20250122-nfs-6-14-v1-1-164b0b5aa330@xxxxxxxxxx > --- > net/sunrpc/debugfs.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c > index a176d5a0b0ee9a2c0ca1d1ed3131b67b782c3296..9498f385716d5eab1c5766a2a4ef5218155432e0 100644 > --- a/net/sunrpc/debugfs.c > +++ b/net/sunrpc/debugfs.c > @@ -179,6 +179,18 @@ xprt_info_show(struct seq_file *f, void *v) > seq_printf(f, "addr: %s\n", xprt->address_strings[RPC_DISPLAY_ADDR]); > seq_printf(f, "port: %s\n", xprt->address_strings[RPC_DISPLAY_PORT]); > seq_printf(f, "state: 0x%lx\n", xprt->state); > + seq_printf(f, "netns: %u\n", xprt->xprt_net->ns.inum); > + > + if (xprt->ops->get_srcaddr) { > + int ret, buflen; > + char buf[INET6_ADDRSTRLEN]; > + > + buflen = ARRAY_SIZE(buf); > + ret = xprt->ops->get_srcaddr(xprt, buf, buflen); > + if (ret < 0) > + ret = sprintf(buf, "<closed>"); > + seq_printf(f, "saddr: %.*s\n", ret, buf); > + } > return 0; > } > > > --- > base-commit: ffd294d346d185b70e28b1a28abe367bbfe53c04 > change-id: 20250122-nfs-6-14-7f737deb6356 > > Best regards, Please disregard this patch. I didn't realize Anna had picked this up for v6.14. Cheers, -- Jeff Layton <jlayton@xxxxxxxxxx>
