Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cc7b4b9 authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre: remove CFS_MODULE_PARM 



Patch generated by coccinelle:

@generic_type@
declarer name CFS_MODULE_PARM;
declarer name module_param;
declarer name MODULE_PARM_DESC;
expression E1, E2, E3, E4;
type t;
@@
-CFS_MODULE_PARM(E1, E2, t, E3, E4);
+module_param(E1, t, E3);
+MODULE_PARM_DESC(E1, E4);

@charp@
expression E1, E2, E3, E4, E5;
@@
-CFS_MODULE_PARM(E1, E2, E3, E4, E5);
+module_param(E1, E3, E4);
+MODULE_PARM_DESC(E1, E5);

With manual modification to remove CFS_MODULE_PARM definition and
fix up checkpatch.pl warnnings.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da7a96ae

drivers/staging/lustre/include/linux/libcfs/linux/kp30.h

+0 −7
Original line number Diff line number Diff line
@@ -70,13 +70,6 @@ 


#include <linux/libcfs/linux/portals_compat25.h>





/******************************************************************************/

/* Module parameter support */

#define CFS_MODULE_PARM(name, t, type, perm, desc) \

	module_param(name, type, perm);\

	MODULE_PARM_DESC(name, desc)



/* ------------------------------------------------------------------ */



# define LI_POISON 0x5a5a5a5a

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c

+48 −48
Original line number Diff line number Diff line
@@ -41,95 +41,95 @@ 
#include "o2iblnd.h"



static int service = 987;

CFS_MODULE_PARM(service, "i", int, 0444,

		"service number (within RDMA_PS_TCP)");

module_param(service, int, 0444);

MODULE_PARM_DESC(service, "service number (within RDMA_PS_TCP)");



static int cksum = 0;

CFS_MODULE_PARM(cksum, "i", int, 0644,

		"set non-zero to enable message (not RDMA) checksums");

module_param(cksum, int, 0644);

MODULE_PARM_DESC(cksum, "set non-zero to enable message (not RDMA) checksums");



static int timeout = 50;

CFS_MODULE_PARM(timeout, "i", int, 0644,

		"timeout (seconds)");

module_param(timeout, int, 0644);

MODULE_PARM_DESC(timeout, "timeout (seconds)");



/* Number of threads in each scheduler pool which is percpt,

 * we will estimate reasonable value based on CPUs if it's set to zero. */

static int nscheds;

CFS_MODULE_PARM(nscheds, "i", int, 0444,

		"number of threads in each scheduler pool");

module_param(nscheds, int, 0444);

MODULE_PARM_DESC(nscheds, "number of threads in each scheduler pool");



/* NB: this value is shared by all CPTs, it can grow at runtime */

static int ntx = 512;

CFS_MODULE_PARM(ntx, "i", int, 0444,

		"# of message descriptors allocated for each pool");

module_param(ntx, int, 0444);

MODULE_PARM_DESC(ntx, "# of message descriptors allocated for each pool");



/* NB: this value is shared by all CPTs */

static int credits = 256;

CFS_MODULE_PARM(credits, "i", int, 0444,

		"# concurrent sends");

module_param(credits, int, 0444);

MODULE_PARM_DESC(credits, "# concurrent sends");



static int peer_credits = 8;

CFS_MODULE_PARM(peer_credits, "i", int, 0444,

		"# concurrent sends to 1 peer");

module_param(peer_credits, int, 0444);

MODULE_PARM_DESC(peer_credits, "# concurrent sends to 1 peer");



static int peer_credits_hiw = 0;

CFS_MODULE_PARM(peer_credits_hiw, "i", int, 0444,

		"when eagerly to return credits");

module_param(peer_credits_hiw, int, 0444);

MODULE_PARM_DESC(peer_credits_hiw, "when eagerly to return credits");



static int peer_buffer_credits = 0;

CFS_MODULE_PARM(peer_buffer_credits, "i", int, 0444,

		"# per-peer router buffer credits");

module_param(peer_buffer_credits, int, 0444);

MODULE_PARM_DESC(peer_buffer_credits, "# per-peer router buffer credits");



static int peer_timeout = 180;

CFS_MODULE_PARM(peer_timeout, "i", int, 0444,

		"Seconds without aliveness news to declare peer dead (<=0 to disable)");

module_param(peer_timeout, int, 0444);

MODULE_PARM_DESC(peer_timeout, "Seconds without aliveness news to declare peer dead (<=0 to disable)");



static char *ipif_name = "ib0";

CFS_MODULE_PARM(ipif_name, "s", charp, 0444,

		"IPoIB interface name");

module_param(ipif_name, charp, 0444);

MODULE_PARM_DESC(ipif_name, "IPoIB interface name");



static int retry_count = 5;

CFS_MODULE_PARM(retry_count, "i", int, 0644,

		"Retransmissions when no ACK received");

module_param(retry_count, int, 0644);

MODULE_PARM_DESC(retry_count, "Retransmissions when no ACK received");



static int rnr_retry_count = 6;

CFS_MODULE_PARM(rnr_retry_count, "i", int, 0644,

		"RNR retransmissions");

module_param(rnr_retry_count, int, 0644);

MODULE_PARM_DESC(rnr_retry_count, "RNR retransmissions");



static int keepalive = 100;

CFS_MODULE_PARM(keepalive, "i", int, 0644,

		"Idle time in seconds before sending a keepalive");

module_param(keepalive, int, 0644);

MODULE_PARM_DESC(keepalive, "Idle time in seconds before sending a keepalive");



static int ib_mtu = 0;

CFS_MODULE_PARM(ib_mtu, "i", int, 0444,

		"IB MTU 256/512/1024/2048/4096");

module_param(ib_mtu, int, 0444);

MODULE_PARM_DESC(ib_mtu, "IB MTU 256/512/1024/2048/4096");



static int concurrent_sends = 0;

CFS_MODULE_PARM(concurrent_sends, "i", int, 0444,

		"send work-queue sizing");

module_param(concurrent_sends, int, 0444);

MODULE_PARM_DESC(concurrent_sends, "send work-queue sizing");



static int map_on_demand = 0;

CFS_MODULE_PARM(map_on_demand, "i", int, 0444,

		"map on demand");

module_param(map_on_demand, int, 0444);

MODULE_PARM_DESC(map_on_demand, "map on demand");



/* NB: this value is shared by all CPTs, it can grow at runtime */

static int fmr_pool_size = 512;

CFS_MODULE_PARM(fmr_pool_size, "i", int, 0444,

		"size of fmr pool on each CPT (>= ntx / 4)");

module_param(fmr_pool_size, int, 0444);

MODULE_PARM_DESC(fmr_pool_size, "size of fmr pool on each CPT (>= ntx / 4)");



/* NB: this value is shared by all CPTs, it can grow at runtime */

static int fmr_flush_trigger = 384;

CFS_MODULE_PARM(fmr_flush_trigger, "i", int, 0444,

		"# dirty FMRs that triggers pool flush");

module_param(fmr_flush_trigger, int, 0444);

MODULE_PARM_DESC(fmr_flush_trigger, "# dirty FMRs that triggers pool flush");



static int fmr_cache = 1;

CFS_MODULE_PARM(fmr_cache, "i", int, 0444,

		"non-zero to enable FMR caching");

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;

CFS_MODULE_PARM(pmr_pool_size, "i", int, 0444,

		"size of MR cache pmr pool on each CPT");

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
@@ -137,17 +137,17 @@ CFS_MODULE_PARM(pmr_pool_size, "i", int, 0444, 
 * 2: force to failover (for debug)

 */

static int dev_failover = 0;

CFS_MODULE_PARM(dev_failover, "i", int, 0444,

	       "HCA failover for bonding (0 off, 1 on, other values reserved)");

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 = 0;

CFS_MODULE_PARM(require_privileged_port, "i", int, 0644,

		"require privileged port when accepting connection");

module_param(require_privileged_port, int, 0644);

MODULE_PARM_DESC(require_privileged_port, "require privileged port when accepting connection");



static int use_privileged_port = 1;

CFS_MODULE_PARM(use_privileged_port, "i", int, 0644,

		"use privileged port when initiating connection");

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,

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c

+56 −56
Original line number Diff line number Diff line
@@ -22,123 +22,123 @@ 
#include "socklnd.h"



static int sock_timeout = 50;

CFS_MODULE_PARM(sock_timeout, "i", int, 0644,

		"dead socket timeout (seconds)");

module_param(sock_timeout, int, 0644);

MODULE_PARM_DESC(sock_timeout, "dead socket timeout (seconds)");



static int credits = 256;

CFS_MODULE_PARM(credits, "i", int, 0444,

		"# concurrent sends");

module_param(credits, int, 0444);

MODULE_PARM_DESC(credits, "# concurrent sends");



static int peer_credits = 8;

CFS_MODULE_PARM(peer_credits, "i", int, 0444,

		"# concurrent sends to 1 peer");

module_param(peer_credits, int, 0444);

MODULE_PARM_DESC(peer_credits, "# concurrent sends to 1 peer");



static int peer_buffer_credits = 0;

CFS_MODULE_PARM(peer_buffer_credits, "i", int, 0444,

		"# per-peer router buffer credits");

module_param(peer_buffer_credits, int, 0444);

MODULE_PARM_DESC(peer_buffer_credits, "# per-peer router buffer credits");



static int peer_timeout = 180;

CFS_MODULE_PARM(peer_timeout, "i", int, 0444,

		"Seconds without aliveness news to declare peer dead (<=0 to disable)");

module_param(peer_timeout, int, 0444);

MODULE_PARM_DESC(peer_timeout, "Seconds without aliveness news to declare peer dead (<=0 to disable)");



/* Number of daemons in each thread pool which is percpt,

 * we will estimate reasonable value based on CPUs if it's not set. */

static unsigned int nscheds;

CFS_MODULE_PARM(nscheds, "i", int, 0444,

		"# scheduler daemons in each pool while starting");

module_param(nscheds, int, 0444);

MODULE_PARM_DESC(nscheds, "# scheduler daemons in each pool while starting");



static int nconnds = 4;

CFS_MODULE_PARM(nconnds, "i", int, 0444,

		"# connection daemons while starting");

module_param(nconnds, int, 0444);

MODULE_PARM_DESC(nconnds, "# connection daemons while starting");



static int nconnds_max = 64;

CFS_MODULE_PARM(nconnds_max, "i", int, 0444,

		"max # connection daemons");

module_param(nconnds_max, int, 0444);

MODULE_PARM_DESC(nconnds_max, "max # connection daemons");



static int min_reconnectms = 1000;

CFS_MODULE_PARM(min_reconnectms, "i", int, 0644,

		"min connection retry interval (mS)");

module_param(min_reconnectms, int, 0644);

MODULE_PARM_DESC(min_reconnectms, "min connection retry interval (mS)");



static int max_reconnectms = 60000;

CFS_MODULE_PARM(max_reconnectms, "i", int, 0644,

		"max connection retry interval (mS)");

module_param(max_reconnectms, int, 0644);

MODULE_PARM_DESC(max_reconnectms, "max connection retry interval (mS)");



# define DEFAULT_EAGER_ACK 0

static int eager_ack = DEFAULT_EAGER_ACK;

CFS_MODULE_PARM(eager_ack, "i", int, 0644,

		"send tcp ack packets eagerly");

module_param(eager_ack, int, 0644);

MODULE_PARM_DESC(eager_ack, "send tcp ack packets eagerly");



static int typed_conns = 1;

CFS_MODULE_PARM(typed_conns, "i", int, 0444,

		"use different sockets for bulk");

module_param(typed_conns, int, 0444);

MODULE_PARM_DESC(typed_conns, "use different sockets for bulk");



static int min_bulk = (1<<10);

CFS_MODULE_PARM(min_bulk, "i", int, 0644,

		"smallest 'large' message");

module_param(min_bulk, int, 0644);

MODULE_PARM_DESC(min_bulk, "smallest 'large' message");



# define DEFAULT_BUFFER_SIZE 0

static int tx_buffer_size = DEFAULT_BUFFER_SIZE;

CFS_MODULE_PARM(tx_buffer_size, "i", int, 0644,

		"socket tx buffer size (0 for system default)");

module_param(tx_buffer_size, int, 0644);

MODULE_PARM_DESC(tx_buffer_size, "socket tx buffer size (0 for system default)");



static int rx_buffer_size = DEFAULT_BUFFER_SIZE;

CFS_MODULE_PARM(rx_buffer_size, "i", int, 0644,

		"socket rx buffer size (0 for system default)");

module_param(rx_buffer_size, int, 0644);

MODULE_PARM_DESC(rx_buffer_size, "socket rx buffer size (0 for system default)");



static int nagle = 0;

CFS_MODULE_PARM(nagle, "i", int, 0644,

		"enable NAGLE?");

module_param(nagle, int, 0644);

MODULE_PARM_DESC(nagle, "enable NAGLE?");



static int round_robin = 1;

CFS_MODULE_PARM(round_robin, "i", int, 0644,

		"Round robin for multiple interfaces");

module_param(round_robin, int, 0644);

MODULE_PARM_DESC(round_robin, "Round robin for multiple interfaces");



static int keepalive = 30;

CFS_MODULE_PARM(keepalive, "i", int, 0644,

		"# seconds before send keepalive");

module_param(keepalive, int, 0644);

MODULE_PARM_DESC(keepalive, "# seconds before send keepalive");



static int keepalive_idle = 30;

CFS_MODULE_PARM(keepalive_idle, "i", int, 0644,

		"# idle seconds before probe");

module_param(keepalive_idle, int, 0644);

MODULE_PARM_DESC(keepalive_idle, "# idle seconds before probe");



#define DEFAULT_KEEPALIVE_COUNT  5

static int keepalive_count = DEFAULT_KEEPALIVE_COUNT;

CFS_MODULE_PARM(keepalive_count, "i", int, 0644,

		"# missed probes == dead");

module_param(keepalive_count, int, 0644);

MODULE_PARM_DESC(keepalive_count, "# missed probes == dead");



static int keepalive_intvl = 5;

CFS_MODULE_PARM(keepalive_intvl, "i", int, 0644,

		"seconds between probes");

module_param(keepalive_intvl, int, 0644);

MODULE_PARM_DESC(keepalive_intvl, "seconds between probes");



static int enable_csum = 0;

CFS_MODULE_PARM(enable_csum, "i", int, 0644,

		"enable check sum");

module_param(enable_csum, int, 0644);

MODULE_PARM_DESC(enable_csum, "enable check sum");



static int inject_csum_error = 0;

CFS_MODULE_PARM(inject_csum_error, "i", int, 0644,

		"set non-zero to inject a checksum error");

module_param(inject_csum_error, int, 0644);

MODULE_PARM_DESC(inject_csum_error, "set non-zero to inject a checksum error");



static int nonblk_zcack = 1;

CFS_MODULE_PARM(nonblk_zcack, "i", int, 0644,

		"always send ZC-ACK on non-blocking connection");

module_param(nonblk_zcack, int, 0644);

MODULE_PARM_DESC(nonblk_zcack, "always send ZC-ACK on non-blocking connection");



static unsigned int zc_min_payload = (16 << 10);

CFS_MODULE_PARM(zc_min_payload, "i", int, 0644,

		"minimum payload size to zero copy");

module_param(zc_min_payload, int, 0644);

MODULE_PARM_DESC(zc_min_payload, "minimum payload size to zero copy");



static unsigned int zc_recv = 0;

CFS_MODULE_PARM(zc_recv, "i", int, 0644,

		"enable ZC recv for Chelsio driver");

module_param(zc_recv, int, 0644);

MODULE_PARM_DESC(zc_recv, "enable ZC recv for Chelsio driver");



static unsigned int zc_recv_min_nfrags = 16;

CFS_MODULE_PARM(zc_recv_min_nfrags, "i", int, 0644,

		"minimum # of fragments to enable ZC recv");

module_param(zc_recv_min_nfrags, int, 0644);

MODULE_PARM_DESC(zc_recv_min_nfrags, "minimum # of fragments to enable ZC recv");





#if SOCKNAL_VERSION_DEBUG

static int protocol = 3;

CFS_MODULE_PARM(protocol, "i", int, 0644,

		"protocol version");

module_param(protocol, int, 0644);

MODULE_PARM_DESC(protocol, "protocol version");

#endif



ksock_tunables_t ksocknal_tunables;

drivers/staging/lustre/lnet/lnet/acceptor.c

+8 −8
Original line number Diff line number Diff line
@@ -64,14 +64,14 @@ lnet_accept_magic(__u32 magic, __u32 constant) 


static char *accept = "secure";



CFS_MODULE_PARM(accept, "s", charp, 0444,

		"Accept connections (secure|all|none)");

CFS_MODULE_PARM(accept_port, "i", int, 0444,

		"Acceptor's port (same on all nodes)");

CFS_MODULE_PARM(accept_backlog, "i", int, 0444,

		"Acceptor's listen backlog");

CFS_MODULE_PARM(accept_timeout, "i", int, 0644,

		"Acceptor's timeout (seconds)");

module_param(accept, charp, 0444);

MODULE_PARM_DESC(accept, "Accept connections (secure|all|none)");

module_param(accept_port, int, 0444);

MODULE_PARM_DESC(accept_port, "Acceptor's port (same on all nodes)");

module_param(accept_backlog, int, 0444);

MODULE_PARM_DESC(accept_backlog, "Acceptor's listen backlog");

module_param(accept_timeout, int, 0644);

MODULE_PARM_DESC(accept_timeout, "Acceptor's timeout (seconds)");



static char *accept_type;

drivers/staging/lustre/lnet/lnet/api-ni.c

+8 −8
Original line number Diff line number Diff line
@@ -45,20 +45,20 @@ EXPORT_SYMBOL(the_lnet); 




static char *ip2nets = "";

CFS_MODULE_PARM(ip2nets, "s", charp, 0444,

		"LNET network <- IP table");

module_param(ip2nets, charp, 0444);

MODULE_PARM_DESC(ip2nets, "LNET network <- IP table");



static char *networks = "";

CFS_MODULE_PARM(networks, "s", charp, 0444,

		"local networks");

module_param(networks, charp, 0444);

MODULE_PARM_DESC(networks, "local networks");



static char *routes = "";

CFS_MODULE_PARM(routes, "s", charp, 0444,

		"routes to non-local networks");

module_param(routes, charp, 0444);

MODULE_PARM_DESC(routes, "routes to non-local networks");



static int rnet_htable_size = LNET_REMOTE_NETS_HASH_DEFAULT;

CFS_MODULE_PARM(rnet_htable_size, "i", int, 0444,

		"size of remote network hash table");

module_param(rnet_htable_size, int, 0444);

MODULE_PARM_DESC(rnet_htable_size, "size of remote network hash table");



char *

lnet_get_routes(void)