These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lnet / klnds / o2iblnd / o2iblnd_modparams.c

diff --git a/kernel/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/kernel/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
index eedf01a..1d4e7ef 100644 (file)
--- a/kernel/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/kernel/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -126,11 +126,6 @@ static int fmr_cache = 1;
 module_param(fmr_cache, int, 0444);
 MODULE_PARM_DESC(fmr_cache, "non-zero to enable FMR caching");
 
-/* NB: this value is shared by all CPTs, it can grow at runtime */
-static int pmr_pool_size = 512;
-module_param(pmr_pool_size, int, 0444);
-MODULE_PARM_DESC(pmr_pool_size, "size of MR cache pmr pool on each CPT");
-
 /*
  * 0: disable failover
  * 1: enable failover if necessary
@@ -140,7 +135,6 @@ static int dev_failover;
 module_param(dev_failover, int, 0444);
 MODULE_PARM_DESC(dev_failover, "HCA failover for bonding (0 off, 1 on, other values reserved)");
 
-
 static int require_privileged_port;
 module_param(require_privileged_port, int, 0644);
 MODULE_PARM_DESC(require_privileged_port, "require privileged port when accepting connection");
@@ -150,30 +144,29 @@ module_param(use_privileged_port, int, 0644);
 MODULE_PARM_DESC(use_privileged_port, "use privileged port when initiating connection");
 
 kib_tunables_t kiblnd_tunables = {
-       .kib_dev_failover          = &dev_failover,
-       .kib_service            = &service,
-       .kib_cksum                = &cksum,
-       .kib_timeout            = &timeout,
-       .kib_keepalive        = &keepalive,
-       .kib_ntx                    = &ntx,
-       .kib_credits            = &credits,
-       .kib_peertxcredits        = &peer_credits,
-       .kib_peercredits_hiw    = &peer_credits_hiw,
-       .kib_peerrtrcredits      = &peer_buffer_credits,
-       .kib_peertimeout            = &peer_timeout,
-       .kib_default_ipif          = &ipif_name,
-       .kib_retry_count            = &retry_count,
-       .kib_rnr_retry_count    = &rnr_retry_count,
-       .kib_concurrent_sends       = &concurrent_sends,
-       .kib_ib_mtu              = &ib_mtu,
-       .kib_map_on_demand        = &map_on_demand,
-       .kib_fmr_pool_size        = &fmr_pool_size,
-       .kib_fmr_flush_trigger      = &fmr_flush_trigger,
-       .kib_fmr_cache        = &fmr_cache,
-       .kib_pmr_pool_size        = &pmr_pool_size,
-       .kib_require_priv_port      = &require_privileged_port,
-       .kib_use_priv_port          = &use_privileged_port,
-       .kib_nscheds                = &nscheds
+       .kib_dev_failover      = &dev_failover,
+       .kib_service           = &service,
+       .kib_cksum             = &cksum,
+       .kib_timeout           = &timeout,
+       .kib_keepalive         = &keepalive,
+       .kib_ntx               = &ntx,
+       .kib_credits           = &credits,
+       .kib_peertxcredits     = &peer_credits,
+       .kib_peercredits_hiw   = &peer_credits_hiw,
+       .kib_peerrtrcredits    = &peer_buffer_credits,
+       .kib_peertimeout       = &peer_timeout,
+       .kib_default_ipif      = &ipif_name,
+       .kib_retry_count       = &retry_count,
+       .kib_rnr_retry_count   = &rnr_retry_count,
+       .kib_concurrent_sends  = &concurrent_sends,
+       .kib_ib_mtu            = &ib_mtu,
+       .kib_map_on_demand     = &map_on_demand,
+       .kib_fmr_pool_size     = &fmr_pool_size,
+       .kib_fmr_flush_trigger = &fmr_flush_trigger,
+       .kib_fmr_cache         = &fmr_cache,
+       .kib_require_priv_port = &require_privileged_port,
+       .kib_use_priv_port     = &use_privileged_port,
+       .kib_nscheds           = &nscheds
 };
 
 int