Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3bf5221 authored by Steve French's avatar Steve French
Browse files

[CIFS] Fix ordering of cleanup on module init failure 



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

Acked-by: default avatarJeff Layton <jlayton@redhat.com>
CC: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 17edec6f

fs/cifs/cifsfs.c

+9 −9
Original line number Diff line number Diff line
@@ -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)
@@ -968,10 +968,10 @@ init_cifs(void) 
	cifs_destroy_mids();

out_destroy_inodecache:

	cifs_destroy_inodecache();

out_unreg_fscache:

	cifs_fscache_unregister();

out_clean_proc:

	cifs_proc_clean();

	cifs_fscache_unregister();

 out:

	return rc;

}

fs/cifs/connect.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include "ntlmssp.h"

#include "nterr.h"

#include "rfc1002pdu.h"

#include "cn_cifs.h"

#include "fscache.h"



#define CIFS_PORT 445