summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfsctl.c
diff options
context:
space:
mode:
authorJeff Layton2012-03-29 13:52:49 +0200
committerJ. Bruce Fields2012-03-29 14:01:07 +0200
commit797a9d797f8483bb67f265c761b76dcd5a077a23 (patch)
treebc114410d0b6f7cc596d1ef8e2905fab00bf321b /fs/nfsd/nfsctl.c
parentnfsd4: use auth_unix unconditionally on backchannel (diff)
downloadkernel-qcow2-linux-797a9d797f8483bb67f265c761b76dcd5a077a23.tar.gz
kernel-qcow2-linux-797a9d797f8483bb67f265c761b76dcd5a077a23.tar.xz
kernel-qcow2-linux-797a9d797f8483bb67f265c761b76dcd5a077a23.zip
nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled
Otherwise, we get a warning or error similar to this when building with CONFIG_NFSD_V4 disabled: ERROR: "nfsd4_cld_block" [fs/nfsd/nfsd.ko] undefined! Fix this by wrapping the calls to rpc_pipefs_notifier_register and ..._unregister in another function and providing no-op replacements when CONFIG_NFSD_V4 is disabled. Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
-rw-r--r--fs/nfsd/nfsctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index dee6c1bb9ba8..2c53be6d3579 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1137,7 +1137,7 @@ static int __init init_nfsd(void)
int retval;
printk(KERN_INFO "Installing knfsd (copyright (C) 1996 okir@monad.swb.de).\n");
- retval = rpc_pipefs_notifier_register(&nfsd4_cld_block);
+ retval = register_cld_notifier();
if (retval)
return retval;
retval = register_pernet_subsys(&nfsd_net_ops);
@@ -1186,7 +1186,7 @@ out_free_slabs:
out_unregister_pernet:
unregister_pernet_subsys(&nfsd_net_ops);
out_unregister_notifier:
- rpc_pipefs_notifier_unregister(&nfsd4_cld_block);
+ unregister_cld_notifier();
return retval;
}
@@ -1203,7 +1203,7 @@ static void __exit exit_nfsd(void)
nfsd_fault_inject_cleanup();
unregister_filesystem(&nfsd_fs_type);
unregister_pernet_subsys(&nfsd_net_ops);
- rpc_pipefs_notifier_unregister(&nfsd4_cld_block);
+ unregister_cld_notifier();
}
MODULE_AUTHOR("Olaf Kirch <okir@monad.swb.de>");