From 77c7dee7ae2ad9aae49f2d6332f36d4e2f7a515c Mon Sep 17 00:00:00 2001 From: Steve French Date: Wed, 22 Sep 2010 19:15:36 +0000 Subject: [PATCH] --- yaml --- r: 213403 b: refs/heads/master c: d3bf5221d3274b5015ad18a55060b074cca8d2f0 h: refs/heads/master i: 213401: c9eebd1729458d06c8cb5b5f7b37db6d3c88dcf0 213399: af0f5735a71eb9553c87855e1ae3d5b130a1e0cd v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsfs.c | 18 +++++++++--------- trunk/fs/cifs/connect.c | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 36c4cfcccfbe..6bd6d1d4da4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17edec6f563ba6b5630329fbe9473557bb475c3d +refs/heads/master: d3bf5221d3274b5015ad18a55060b074cca8d2f0 diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c index 52e89ea07458..eeb8c67a3f29 100644 --- a/trunk/fs/cifs/cifsfs.c +++ b/trunk/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/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index 271038b6ec0e..230410e0a453 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/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