diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-09-22 19:15:36 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-09-29 19:04:32 +0000 |
| commit | d3bf5221d3274b5015ad18a55060b074cca8d2f0 (patch) | |
| tree | 5ac76fa5f694a83d800898b8bb0ab505f66a1597 /fs/cifs | |
| parent | 17edec6f563ba6b5630329fbe9473557bb475c3d (diff) | |
| download | linux-3.10-d3bf5221d3274b5015ad18a55060b074cca8d2f0.tar.gz linux-3.10-d3bf5221d3274b5015ad18a55060b074cca8d2f0.tar.bz2 linux-3.10-d3bf5221d3274b5015ad18a55060b074cca8d2f0.zip | |
[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>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/cifsfs.c | 18 | ||||
| -rw-r--r-- | fs/cifs/connect.c | 1 |
2 files changed, 9 insertions, 10 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 52e89ea0745..eeb8c67a3f2 100644 --- 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 271038b6ec0..230410e0a45 100644 --- 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 |