diff options
author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-04-11 07:13:14 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-04-11 18:01:33 -0400 |
commit | b89109bef4a6a4a8ab5788778ee0addca0787870 (patch) | |
tree | d42ef77b42075c474e1d8f4f4b95a1d5f03c564f /fs/nfsd/nfsctl.c | |
parent | e3f70eadb7dddfb5a2bb9afff7abfc6ee17a29d0 (diff) |
nfsd: pass network context to export caches init/shutdown routines
These functions will be called from per-net operations.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
-rw-r--r-- | fs/nfsd/nfsctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index ae19293e68df..bc76f8ebbe5e 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
@@ -1163,7 +1163,7 @@ static int __init init_nfsd(void) | |||
1163 | retval = nfsd_reply_cache_init(); | 1163 | retval = nfsd_reply_cache_init(); |
1164 | if (retval) | 1164 | if (retval) |
1165 | goto out_free_stat; | 1165 | goto out_free_stat; |
1166 | retval = nfsd_export_init(); | 1166 | retval = nfsd_export_init(&init_net); |
1167 | if (retval) | 1167 | if (retval) |
1168 | goto out_free_cache; | 1168 | goto out_free_cache; |
1169 | nfsd_lockd_init(); /* lockd->nfsd callbacks */ | 1169 | nfsd_lockd_init(); /* lockd->nfsd callbacks */ |
@@ -1184,7 +1184,7 @@ out_free_idmap: | |||
1184 | nfsd_idmap_shutdown(); | 1184 | nfsd_idmap_shutdown(); |
1185 | out_free_lockd: | 1185 | out_free_lockd: |
1186 | nfsd_lockd_shutdown(); | 1186 | nfsd_lockd_shutdown(); |
1187 | nfsd_export_shutdown(); | 1187 | nfsd_export_shutdown(&init_net); |
1188 | out_free_cache: | 1188 | out_free_cache: |
1189 | nfsd_reply_cache_shutdown(); | 1189 | nfsd_reply_cache_shutdown(); |
1190 | out_free_stat: | 1190 | out_free_stat: |
@@ -1201,7 +1201,7 @@ out_unregister_notifier: | |||
1201 | 1201 | ||
1202 | static void __exit exit_nfsd(void) | 1202 | static void __exit exit_nfsd(void) |
1203 | { | 1203 | { |
1204 | nfsd_export_shutdown(); | 1204 | nfsd_export_shutdown(&init_net); |
1205 | nfsd_reply_cache_shutdown(); | 1205 | nfsd_reply_cache_shutdown(); |
1206 | remove_proc_entry("fs/nfs/exports", NULL); | 1206 | remove_proc_entry("fs/nfs/exports", NULL); |
1207 | remove_proc_entry("fs/nfs", NULL); | 1207 | remove_proc_entry("fs/nfs", NULL); |