[CIFS] Fix ordering of cleanup on module init failure

If registering fs cache failed, we weren't cleaning up proc.

Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 52e89ea07458bff74f2bb5819533d2d2118bc861..eeb8c67a3f29ed0703f38cd45b8077b18b9742ca 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -933,11 +933,11 @@ init_cifs(void)
 
        rc = cifs_fscache_register();
        if (rc)
-               goto out;
+               goto out_clean_proc;
 
        rc = cifs_init_inodecache();
        if (rc)
-               goto out_clean_proc;
+               goto out_unreg_fscache;
 
        rc = cifs_init_mids();
        if (rc)
@@ -959,19 +959,19 @@ init_cifs(void)
        return 0;
 
 #ifdef CONFIG_CIFS_UPCALL
- out_unregister_filesystem:
+out_unregister_filesystem:
        unregister_filesystem(&cifs_fs_type);
 #endif
- out_destroy_request_bufs:
+out_destroy_request_bufs:
        cifs_destroy_request_bufs();
- out_destroy_mids:
+out_destroy_mids:
        cifs_destroy_mids();
- out_destroy_inodecache:
+out_destroy_inodecache:
        cifs_destroy_inodecache();
- out_clean_proc:
-       cifs_proc_clean();
+out_unreg_fscache:
        cifs_fscache_unregister();
- out:
+out_clean_proc:
+       cifs_proc_clean();
        return rc;
 }
 

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 271038b6ec0e057de721fc5d9d9123f81531bb10..230410e0a453ef856c4a5d22d2dce720b1553fa1 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -47,7 +47,6 @@
 #include "ntlmssp.h"
 #include "nterr.h"
 #include "rfc1002pdu.h"
-#include "cn_cifs.h"
 #include "fscache.h"
 
 #define CIFS_PORT 445