diff options
Diffstat (limited to 'fs/lockd/svc.c')
| -rw-r--r-- | fs/lockd/svc.c | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 10d6c41aeca..8f27c93f8d2 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -235,6 +235,7 @@ out_err:  	if (warned++ == 0)  		printk(KERN_WARNING  			"lockd_up: makesock failed, error=%d\n", err); +	svc_shutdown_net(serv, net);  	return err;  } @@ -435,7 +436,7 @@ EXPORT_SYMBOL_GPL(lockd_down);   * Sysctl parameters (same as module parameters, different interface).   */ -static ctl_table nlm_sysctls[] = { +static struct ctl_table nlm_sysctls[] = {  	{  		.procname	= "nlm_grace_period",  		.data		= &nlm_grace_period, @@ -489,7 +490,7 @@ static ctl_table nlm_sysctls[] = {  	{ }  }; -static ctl_table nlm_sysctl_dir[] = { +static struct ctl_table nlm_sysctl_dir[] = {  	{  		.procname	= "nfs",  		.mode		= 0555, @@ -498,7 +499,7 @@ static ctl_table nlm_sysctl_dir[] = {  	{ }  }; -static ctl_table nlm_sysctl_root[] = { +static struct ctl_table nlm_sysctl_root[] = {  	{  		.procname	= "fs",  		.mode		= 0555, @@ -621,8 +622,8 @@ static int __init init_nlm(void)  err_pernet:  #ifdef CONFIG_SYSCTL  	unregister_sysctl_table(nlm_sysctl_table); -#endif  err_sysctl: +#endif  	return err;  }  | 
