SUNRPC keep track of number of transports to unique addresses

Currently, xprt_switch keeps a number of all xprts (xps_nxprts)
that were added to the switch regardless of whethere it's an
nconnect transport or a transport to a trunkable address.
Introduce a new counter to keep track of transports to unique
destination addresses per xprt_switch.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/include/linux/sunrpc/xprtmultipath.h b/include/linux/sunrpc/xprtmultipath.h
index b19addc8b7159b099fc73f536cf751ae6c5e31ee..bbb8a5fa08163a3ace88e0b23c384075d99117ac 100644 (file)
--- a/include/linux/sunrpc/xprtmultipath.h
+++ b/include/linux/sunrpc/xprtmultipath.h
@@ -18,6 +18,7 @@ struct rpc_xprt_switch {
        unsigned int            xps_id;
        unsigned int            xps_nxprts;
        unsigned int            xps_nactive;
+       unsigned int            xps_nunique_destaddr_xprts;
        atomic_long_t           xps_queuelen;
        struct list_head        xps_xprt_list;
 

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index a5b7f6e34d155c3dc4b74913ae4ff908d73ba1bc..451ac7d031db2f3586201bab38b6da540bc8d74c 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2799,7 +2799,7 @@ int rpc_clnt_test_and_add_xprt(struct rpc_clnt *clnt,
 
        task = rpc_call_null_helper(clnt, xprt, NULL, RPC_TASK_ASYNC,
                        &rpc_cb_add_xprt_call_ops, data);
-
+       data->xps->xps_nunique_destaddr_xprts++;
        rpc_put_task(task);
 success:
        return 1;

diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c
index c60820e45082c0474cd1452bf774de6130a17484..1693f81aae376342660f4b2da08ae32b40355298 100644 (file)
--- a/net/sunrpc/xprtmultipath.c
+++ b/net/sunrpc/xprtmultipath.c
@@ -139,6 +139,7 @@ struct rpc_xprt_switch *xprt_switch_alloc(struct rpc_xprt *xprt,
                xps->xps_iter_ops = &rpc_xprt_iter_singular;
                rpc_sysfs_xprt_switch_setup(xps, xprt, gfp_flags);
                xprt_switch_add_xprt_locked(xps, xprt);
+               xps->xps_nunique_destaddr_xprts = 1;
                rpc_sysfs_xprt_setup(xps, xprt, gfp_flags);
        }