diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-19 12:34:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-19 12:34:58 +1100 |
| commit | 4228ea45005e50b2edc0da5bb042de50df6a0bf8 (patch) | |
| tree | d1b53b865bb0590354cea5edfc3f6a813c7431b8 /fs/nfs | |
| parent | 4874bcb26e6a9ed501d587573848f9725192ea3b (diff) | |
| parent | 1711067376d5a26dc0b873a343a65c7e5e30c3a2 (diff) | |
Merge branch 'quilt/rr'
Diffstat (limited to 'fs/nfs')
| -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 293fa0528a6e..52a7200233f0 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); |