Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux

* 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux:
  knfsd: query filesystem for NFSv4 getattr of FATTR4_MAXNAME
  knfsd: nfsv4 delegation recall should take reference on client
  knfsd: don't shutdown callbacks until nfsv4 client is freed
  knfsd: let nfsd manage timing out its own leases
  knfsd: Add source address to sunrpc svc errors
  knfsd: 64 bit ino support for NFS server
  svcgss: move init code into separate function
  knfsd: remove code duplication in nfsd4_setclientid()
  nfsd warning fix
  knfsd: fix callback rpc cred
  knfsd: move nfsv4 slab creation/destruction to module init/exit
  knfsd: spawn kernel thread to probe callback channel
  knfsd: nfs4 name->id mapping not correctly parsing negative downcall
  knfsd: demote some printk()s to dprintk()s
  knfsd: cleanup of nfsd4 cmp_* functions
  knfsd: delete code made redundant by map_new_errors
  nfsd: fix horrible indentation in nfsd_setattr
  nfsd: remove unused cache_for_each macro
  nfsd: tone down inaccurate dprintk

1 files changed, 5 insertions, 2 deletions

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index baac89d917ca..77dc9893b7ba 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -298,7 +298,7 @@ static ssize_t write_filehandle(struct file *file, char *buf, size_t size)
          * qword quoting is used, so filehandle will be \x....
          */
         char *dname, *path;
-        int maxsize;
+        int uninitialized_var(maxsize);
         char *mesg = buf;
         int len;
         struct auth_domain *dom;
@@ -679,11 +679,13 @@ 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 */
+        if (retval)
+                return retval;
         nfsd_stat_init();       /* Statistics */
         nfsd_cache_init();      /* RPC reply cache */
         nfsd_export_init();     /* Exports table */
         nfsd_lockd_init();      /* lockd->nfsd callbacks */
-        nfs4_state_init();      /* NFSv4 locking state */
         nfsd_idmap_init();      /* Name to ID mapping */
         if (proc_mkdir("fs/nfs", NULL)) {
                 struct proc_dir_entry *entry;
@@ -712,6 +714,7 @@ static void __exit exit_nfsd(void)
         nfsd_stat_shutdown();
         nfsd_lockd_shutdown();
         nfsd_idmap_shutdown();
+        nfsd4_free_slabs();
         unregister_filesystem(&nfsd_fs_type);
 }