diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-03-29 07:52:49 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-03-29 08:01:07 -0400 |
commit | 797a9d797f8483bb67f265c761b76dcd5a077a23 (patch) | |
tree | bc114410d0b6f7cc596d1ef8e2905fab00bf321b /fs/nfsd/nfsd.h | |
parent | 4ca1f872cda31fe1cfe5e90e027f7bef4980364c (diff) |
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/nfsd.h')
-rw-r--r-- | fs/nfsd/nfsd.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 1d1e8589b4ce..1671429ffa66 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h | |||
@@ -364,12 +364,17 @@ static inline u32 nfsd_suppattrs2(u32 minorversion) | |||
364 | NFSD_WRITEABLE_ATTRS_WORD2 | 364 | NFSD_WRITEABLE_ATTRS_WORD2 |
365 | 365 | ||
366 | extern int nfsd4_is_junction(struct dentry *dentry); | 366 | extern int nfsd4_is_junction(struct dentry *dentry); |
367 | #else | 367 | extern int register_cld_notifier(void); |
368 | extern void unregister_cld_notifier(void); | ||
369 | #else /* CONFIG_NFSD_V4 */ | ||
368 | static inline int nfsd4_is_junction(struct dentry *dentry) | 370 | static inline int nfsd4_is_junction(struct dentry *dentry) |
369 | { | 371 | { |
370 | return 0; | 372 | return 0; |
371 | } | 373 | } |
372 | 374 | ||
375 | #define register_cld_notifier() 0 | ||
376 | #define unregister_cld_notifier() do { } while(0) | ||
377 | |||
373 | #endif /* CONFIG_NFSD_V4 */ | 378 | #endif /* CONFIG_NFSD_V4 */ |
374 | 379 | ||
375 | #endif /* LINUX_NFSD_NFSD_H */ | 380 | #endif /* LINUX_NFSD_NFSD_H */ |