From c23d13ceaf8dd726d484261adcbbcbd8651dff7b Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Thu, 18 Aug 2011 04:41:55 +0000
Subject: [PATCH] --- yaml --- r: 263087 b: refs/heads/master c:
 13589c437daf4c8e429b3236c0b923de1c9420d8 h: refs/heads/master i:   263085:
 cecf165b5e785476f16f9b725b84d03fea606f41   263083:
 03638f5a41138c9f298222cb2a6b97eed073003f   263079:
 4b891e2257e3c1f9736040ea9e7f51f18ecf34d7   263071:
 b0823e7391bd40300f3dfc7867ed33e9f74aebab v: v3

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

diff --git a/[refs] b/[refs]
index 394bc284eb95..b93c37876257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa71f447065f676157ba6a2c121ba419818fc559
+refs/heads/master: 13589c437daf4c8e429b3236c0b923de1c9420d8
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 80c2e3add3a2..633c246b6775 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -2878,7 +2878,8 @@ cleanup_volume_info_contents(struct smb_vol *volume_info)
 	kfree(volume_info->username);
 	kzfree(volume_info->password);
 	kfree(volume_info->UNC);
-	kfree(volume_info->UNCip);
+	if (volume_info->UNCip != volume_info->UNC + 2)
+		kfree(volume_info->UNCip);
 	kfree(volume_info->domainname);
 	kfree(volume_info->iocharset);
 	kfree(volume_info->prepath);