Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[linux-2.6] / fs / nfsd / nfssvc.c

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 79b25b19fec847a5c2db422f19794d57805b6d75..1697539a7171777815cf6e54bd7738e3e3fdacde 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -95,7 +95,7 @@ nfsd_svc(unsigned short port, int nrservs)
        error = nfsd_racache_init(2*nrservs);
        if (error<0)
                goto out;
-       error = nfs4_state_init();
+       error = nfs4_state_start();
        if (error<0)
                goto out;
        if (!nfsd_serv) {
@@ -287,6 +287,7 @@ out:
        svc_exit_thread(rqstp);
 
        /* Release module */
+       unlock_kernel();
        module_put_and_exit(0);
 }
 
@@ -376,6 +377,7 @@ static struct svc_program   nfsd_acl_program = {
        .pg_nvers               = NFSD_ACL_NRVERS,
        .pg_vers                = nfsd_acl_version,
        .pg_name                = "nfsd",
+       .pg_class               = "nfsd",
        .pg_stats               = &nfsd_acl_svcstats,
 };