lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] knfsd: nfsd4: idmap initialization

Browse Source 
Adopt standard kernel style by defining a no-op function instead of putting
ifdef's in the code where the function is called.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
NeilBrown
2005-06-23 22:03:35 -07:00
committed by Linus Torvalds
parent 707d4ab7b3
commit bd0b1e954e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfsctl.c
View File

@@ -398,9 +398,7 @@ static int __init init_nfsd(void)
nfsd_export_init(); /* Exports table */ nfsd_export_init(); /* Exports table */
nfsd_lockd_init(); /* lockd->nfsd callbacks */ nfsd_lockd_init(); /* lockd->nfsd callbacks */
nfs4_state_init(); /* NFSv4 locking state */ nfs4_state_init(); /* NFSv4 locking state */
#ifdef CONFIG_NFSD_V4
nfsd_idmap_init(); /* Name to ID mapping */ nfsd_idmap_init(); /* Name to ID mapping */
#endif /* CONFIG_NFSD_V4 */
if (proc_mkdir("fs/nfs", NULL)) { if (proc_mkdir("fs/nfs", NULL)) {
struct proc_dir_entry *entry; struct proc_dir_entry *entry;
entry = create_proc_entry("fs/nfs/exports", 0, NULL); entry = create_proc_entry("fs/nfs/exports", 0, NULL);
@@ -427,9 +425,7 @@ static void __exit exit_nfsd(void)
remove_proc_entry("fs/nfs", NULL); remove_proc_entry("fs/nfs", NULL);
nfsd_stat_shutdown(); nfsd_stat_shutdown();
nfsd_lockd_shutdown(); nfsd_lockd_shutdown();
#ifdef CONFIG_NFSD_V4
nfsd_idmap_shutdown(); nfsd_idmap_shutdown();
#endif /* CONFIG_NFSD_V4 */
unregister_filesystem(&nfsd_fs_type); unregister_filesystem(&nfsd_fs_type);
} }

5
include/linux/nfsd_idmap.h
View File

@@ -43,8 +43,13 @@
/* XXX from linux/nfs_idmap.h */ /* XXX from linux/nfs_idmap.h */
#define IDMAP_NAMESZ 128 #define IDMAP_NAMESZ 128
#ifdef CONFIG_NFSD_V4
void nfsd_idmap_init(void); void nfsd_idmap_init(void);
void nfsd_idmap_shutdown(void); void nfsd_idmap_shutdown(void);
#else
static inline void nfsd_idmap_init(void) {};
static inline void nfsd_idmap_shutdown(void) {};
#endif
int nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, __u32 *); int nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, __u32 *);
int nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, __u32 *); int nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, __u32 *);