diff options
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/auth.c | 9 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 26 |
2 files changed, 22 insertions, 13 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 880d0de3f50f..36cb66022a27 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c | |||
@@ -39,7 +39,7 @@ static LIST_HEAD(cred_unused); | |||
39 | static unsigned long number_cred_unused; | 39 | static unsigned long number_cred_unused; |
40 | 40 | ||
41 | #define MAX_HASHTABLE_BITS (10) | 41 | #define MAX_HASHTABLE_BITS (10) |
42 | static int param_set_hashtbl_sz(const char *val, struct kernel_param *kp) | 42 | static int param_set_hashtbl_sz(const char *val, const struct kernel_param *kp) |
43 | { | 43 | { |
44 | unsigned long num; | 44 | unsigned long num; |
45 | unsigned int nbits; | 45 | unsigned int nbits; |
@@ -61,7 +61,7 @@ out_inval: | |||
61 | return -EINVAL; | 61 | return -EINVAL; |
62 | } | 62 | } |
63 | 63 | ||
64 | static int param_get_hashtbl_sz(char *buffer, struct kernel_param *kp) | 64 | static int param_get_hashtbl_sz(char *buffer, const struct kernel_param *kp) |
65 | { | 65 | { |
66 | unsigned int nbits; | 66 | unsigned int nbits; |
67 | 67 | ||
@@ -71,6 +71,11 @@ static int param_get_hashtbl_sz(char *buffer, struct kernel_param *kp) | |||
71 | 71 | ||
72 | #define param_check_hashtbl_sz(name, p) __param_check(name, p, unsigned int); | 72 | #define param_check_hashtbl_sz(name, p) __param_check(name, p, unsigned int); |
73 | 73 | ||
74 | static struct kernel_param_ops param_ops_hashtbl_sz = { | ||
75 | .set = param_set_hashtbl_sz, | ||
76 | .get = param_get_hashtbl_sz, | ||
77 | }; | ||
78 | |||
74 | module_param_named(auth_hashtable_size, auth_hashbits, hashtbl_sz, 0644); | 79 | module_param_named(auth_hashtable_size, auth_hashbits, hashtbl_sz, 0644); |
75 | MODULE_PARM_DESC(auth_hashtable_size, "RPC credential cache hashtable size"); | 80 | MODULE_PARM_DESC(auth_hashtable_size, "RPC credential cache hashtable size"); |
76 | 81 | ||
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 66d136984d57..b6309db56226 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -2593,7 +2593,8 @@ void cleanup_socket_xprt(void) | |||
2593 | xprt_unregister_transport(&xs_bc_tcp_transport); | 2593 | xprt_unregister_transport(&xs_bc_tcp_transport); |
2594 | } | 2594 | } |
2595 | 2595 | ||
2596 | static int param_set_uint_minmax(const char *val, struct kernel_param *kp, | 2596 | static int param_set_uint_minmax(const char *val, |
2597 | const struct kernel_param *kp, | ||
2597 | unsigned int min, unsigned int max) | 2598 | unsigned int min, unsigned int max) |
2598 | { | 2599 | { |
2599 | unsigned long num; | 2600 | unsigned long num; |
@@ -2608,34 +2609,37 @@ static int param_set_uint_minmax(const char *val, struct kernel_param *kp, | |||
2608 | return 0; | 2609 | return 0; |
2609 | } | 2610 | } |
2610 | 2611 | ||
2611 | static int param_set_portnr(const char *val, struct kernel_param *kp) | 2612 | static int param_set_portnr(const char *val, const struct kernel_param *kp) |
2612 | { | 2613 | { |
2613 | return param_set_uint_minmax(val, kp, | 2614 | return param_set_uint_minmax(val, kp, |
2614 | RPC_MIN_RESVPORT, | 2615 | RPC_MIN_RESVPORT, |
2615 | RPC_MAX_RESVPORT); | 2616 | RPC_MAX_RESVPORT); |
2616 | } | 2617 | } |
2617 | 2618 | ||
2618 | static int param_get_portnr(char *buffer, struct kernel_param *kp) | 2619 | static struct kernel_param_ops param_ops_portnr = { |
2619 | { | 2620 | .set = param_set_portnr, |
2620 | return param_get_uint(buffer, kp); | 2621 | .get = param_get_uint, |
2621 | } | 2622 | }; |
2623 | |||
2622 | #define param_check_portnr(name, p) \ | 2624 | #define param_check_portnr(name, p) \ |
2623 | __param_check(name, p, unsigned int); | 2625 | __param_check(name, p, unsigned int); |
2624 | 2626 | ||
2625 | module_param_named(min_resvport, xprt_min_resvport, portnr, 0644); | 2627 | module_param_named(min_resvport, xprt_min_resvport, portnr, 0644); |
2626 | module_param_named(max_resvport, xprt_max_resvport, portnr, 0644); | 2628 | module_param_named(max_resvport, xprt_max_resvport, portnr, 0644); |
2627 | 2629 | ||
2628 | static int param_set_slot_table_size(const char *val, struct kernel_param *kp) | 2630 | static int param_set_slot_table_size(const char *val, |
2631 | const struct kernel_param *kp) | ||
2629 | { | 2632 | { |
2630 | return param_set_uint_minmax(val, kp, | 2633 | return param_set_uint_minmax(val, kp, |
2631 | RPC_MIN_SLOT_TABLE, | 2634 | RPC_MIN_SLOT_TABLE, |
2632 | RPC_MAX_SLOT_TABLE); | 2635 | RPC_MAX_SLOT_TABLE); |
2633 | } | 2636 | } |
2634 | 2637 | ||
2635 | static int param_get_slot_table_size(char *buffer, struct kernel_param *kp) | 2638 | static struct kernel_param_ops param_ops_slot_table_size = { |
2636 | { | 2639 | .set = param_set_slot_table_size, |
2637 | return param_get_uint(buffer, kp); | 2640 | .get = param_get_uint, |
2638 | } | 2641 | }; |
2642 | |||
2639 | #define param_check_slot_table_size(name, p) \ | 2643 | #define param_check_slot_table_size(name, p) \ |
2640 | __param_check(name, p, unsigned int); | 2644 | __param_check(name, p, unsigned int); |
2641 | 2645 | ||