SUNRPC: Change the default limit to the number of TCP slots

Since the scheme of limiting the number of TCP slots to whatever will
fit in the current TCP window seems to be working well (Andy reports
getting within 20% of the 'iperf' send performance on a 10GigE link)
we should just let that be the default mode of operation.

Users may still set their own limits using the tcp_max_slot_table_entries
parameter if they need to.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index c23469308b8e4e670f3163fdd9a4156d8cebcde8..9e101c1b81cfb94f729ed29e359d4c57e60df906 100644 (file)
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -190,7 +190,7 @@ struct nfs_server {
 
 
 /* maximum number of slots to use */
-#define NFS4_MAX_SLOT_TABLE RPC_MAX_SLOT_TABLE
+#define NFS4_MAX_SLOT_TABLE (128U)
 
 #if defined(CONFIG_NFS_V4)
 

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 15518a152ac3db6e973a95685d50d200e6a1f475..b033f366d5f678943c04c9289f380a1ae3436317 100644 (file)
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -21,8 +21,8 @@
 
 #define RPC_MIN_SLOT_TABLE     (2U)
 #define RPC_DEF_SLOT_TABLE     (16U)
-#define RPC_MAX_SLOT_TABLE     (128U)
 #define RPC_MAX_SLOT_TABLE_LIMIT       (65536U)
+#define RPC_MAX_SLOT_TABLE     RPC_MAX_SLOT_TABLE_LIMIT
 
 /*
  * This describes a timeout strategy