diff options
| author | Bryan Schumaker <bjschuma@netapp.com> | 2011-11-01 23:24:59 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-11-08 06:10:47 +0400 |
| commit | 72083396074035ffa5cf81b6bb3e55f1d615badf (patch) | |
| tree | 65f9092a08828ae068a3950e40f1de1e7d25452d /fs/nfsd/nfsctl.c | |
| parent | 114a0a08d46cfb0eefb1a882f7866b7f57bfc5ba (diff) | |
| download | linux-72083396074035ffa5cf81b6bb3e55f1d615badf.tar.xz | |
NFSD: Call nfsd4_init_slabs() from init_nfsd()
init_nfsd() was calling free_slabs() during cleanup code, but the call
to init_slabs() was hidden in nfsd4_state_init(). This could be
confusing to people unfamiliar with the code.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index b2e8093ebc21..8daa935f329f 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1129,9 +1129,10 @@ static int __init init_nfsd(void) int retval; printk(KERN_INFO "Installing knfsd (copyright (C) 1996 okir@monad.swb.de).\n"); - retval = nfs4_state_init(); /* nfs4 locking state */ + retval = nfsd4_init_slabs(); if (retval) return retval; + nfs4_state_init(); retval = nfsd_fault_inject_init(); /* nfsd fault injection controls */ if (retval) goto out_free_slabs; |