Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[net-next-2.6.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 2a0c892959f4acb49a2e45f67c5a1a6c3ed54e91..a5ed10c9afef09828c84cdc8434cc65f3b1bcbc8 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -933,18 +933,13 @@ init_cifs(void)
        if (rc)
                goto out_unregister_filesystem;
 #endif
-       rc = slow_work_register_user(THIS_MODULE);
-       if (rc)
-               goto out_unregister_key_type;
 
        return 0;
 
- out_unregister_key_type:
 #ifdef CONFIG_CIFS_UPCALL
-       unregister_key_type(&cifs_spnego_key_type);
  out_unregister_filesystem:
-#endif
        unregister_filesystem(&cifs_fs_type);
+#endif
  out_destroy_request_bufs:
        cifs_destroy_request_bufs();
  out_destroy_mids: