From 96b4c7a17fe3c5350ddd79af6fe2f669592bccf3 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 17 Jun 2011 09:14:27 -0400
Subject: [PATCH] --- yaml --- r: 254036 b: refs/heads/master c:
 d687ca380f1a8f3043f42efd2403cbe58c846e70 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/cifs/cifsfs.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f433571eeb0f..9a0a296cfd8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c6292ae4be00454882246d07f38cdf15a823c2a
+refs/heads/master: d687ca380f1a8f3043f42efd2403cbe58c846e70
diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
index 8f7451f3c8e6..4162ee45d043 100644
--- a/trunk/fs/cifs/cifsfs.c
+++ b/trunk/fs/cifs/cifsfs.c
@@ -701,6 +701,8 @@ cifs_do_mount(struct file_system_type *fs_type,
 
 	if (sb->s_fs_info) {
 		cFYI(1, "Use existing superblock");
+		unload_nls(cifs_sb->local_nls);
+		kfree(cifs_sb);
 		goto out_shared;
 	}