2 files changed, 7 insertions, 1 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index a80ee9b80dcf..651245aa829a 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -414,6 +414,8 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
         };
         char servername[48];
 
+        if (args->flags & RPC_CLNT_CREATE_INFINITE_SLOTS)
+                xprtargs.flags |= XPRT_CREATE_INFINITE_SLOTS;
         /*
          * If the caller chooses not to specify a hostname, whip
          * up a string representation of the passed-in address.
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 3081620cb02c..726e702b7a29 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2762,9 +2762,13 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
         struct rpc_xprt *xprt;
         struct sock_xprt *transport;
         struct rpc_xprt *ret;
+        unsigned int max_slot_table_size = xprt_max_tcp_slot_table_entries;
+
+        if (args->flags & XPRT_CREATE_INFINITE_SLOTS)
+                max_slot_table_size = RPC_MAX_SLOT_TABLE_LIMIT;
 
         xprt = xs_setup_xprt(args, xprt_tcp_slot_table_entries,
-                        xprt_max_tcp_slot_table_entries);
+                        max_slot_table_size);
         if (IS_ERR(xprt))
                 return xprt;
         transport = container_of(xprt, struct sock_xprt, xprt);