diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 12:18:13 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-08 12:18:13 +1000 |
commit | 4f9230dde24843403fdcae418983f0864fe41b8f (patch) | |
tree | e19ed6ff835a66f430dfdc8a1c2e754351b35d95 /fs | |
parent | 77e29500909d920165a8a0b60149670f81c8fcf0 (diff) | |
parent | 86f6c1f1e4ab361deb259135733ca33bf8ea2d73 (diff) |
Merge branch 'quilt/rr'
Conflicts:
kernel/module.c
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/callback.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 36dfdae95123..e17b49e2eabd 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -45,7 +45,7 @@ unsigned short nfs_callback_tcpport; unsigned short nfs_callback_tcpport6; #define NFS_CALLBACK_MAXPORTNR (65535U) -static int param_set_portnr(const char *val, struct kernel_param *kp) +static int param_set_portnr(const char *val, const struct kernel_param *kp) { unsigned long num; int ret; @@ -58,11 +58,10 @@ static int param_set_portnr(const char *val, struct kernel_param *kp) *((unsigned int *)kp->arg) = num; return 0; } - -static int param_get_portnr(char *buffer, struct kernel_param *kp) -{ - return param_get_uint(buffer, kp); -} +static struct kernel_param_ops param_ops_portnr = { + .set = param_set_portnr, + .get = param_get_uint, +}; #define param_check_portnr(name, p) __param_check(name, p, unsigned int); module_param_named(callback_tcpport, nfs_callback_set_tcpport, portnr, 0644); |