From 797a9d797f8483bb67f265c761b76dcd5a077a23 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Thu, 29 Mar 2012 07:52:49 -0400 Subject: 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 Signed-off-by: Jeff Layton Signed-off-by: J. Bruce Fields --- fs/nfsd/netns.h | 1 - fs/nfsd/nfs4recover.c | 12 ++++++++++++ fs/nfsd/nfsctl.c | 6 +++--- fs/nfsd/nfsd.h | 7 ++++++- 4 files changed, 21 insertions(+), 5 deletions(-) (limited to 'fs/nfsd') diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h index 66eac332bf8..12e0cff435b 100644 --- a/fs/nfsd/netns.h +++ b/fs/nfsd/netns.h @@ -31,5 +31,4 @@ struct nfsd_net { }; extern int nfsd_net_id; -extern struct notifier_block nfsd4_cld_block; #endif /* __NFSD_NETNS_H__ */ diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index eaaf9482c7f..4767429264a 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -1032,3 +1032,15 @@ rpc_pipefs_event(struct notifier_block *nb, unsigned long event, void *ptr) struct notifier_block nfsd4_cld_block = { .notifier_call = rpc_pipefs_event, }; + +int +register_cld_notifier(void) +{ + return rpc_pipefs_notifier_register(&nfsd4_cld_block); +} + +void +unregister_cld_notifier(void) +{ + rpc_pipefs_notifier_unregister(&nfsd4_cld_block); +} diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index dee6c1bb9ba..2c53be6d357 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 "); diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 1d1e8589b4c..1671429ffa6 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -364,12 +364,17 @@ static inline u32 nfsd_suppattrs2(u32 minorversion) NFSD_WRITEABLE_ATTRS_WORD2 extern int nfsd4_is_junction(struct dentry *dentry); -#else +extern int register_cld_notifier(void); +extern void unregister_cld_notifier(void); +#else /* CONFIG_NFSD_V4 */ static inline int nfsd4_is_junction(struct dentry *dentry) { return 0; } +#define register_cld_notifier() 0 +#define unregister_cld_notifier() do { } while(0) + #endif /* CONFIG_NFSD_V4 */ #endif /* LINUX_NFSD_NFSD_H */ -- cgit v1.2.3