diff --git a/[refs] b/[refs]
index ef17d754289b..9d4c07b3066a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d1c550874bcaf0d9b7fb66f601caed109074f4b
+refs/heads/master: fc6014771bde8a215a9a4ea24b45f76afeb3c922
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 0d1bc61d0b68..22c49c02897d 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1006,12 +1006,14 @@ static int nfs_parse_mount_options(char *raw,
 			string = match_strdup(args);
 			if (string == NULL)
 				goto out_nomem;
+			kfree(mnt->client_address);
 			mnt->client_address = string;
 			break;
 		case Opt_mounthost:
 			string = match_strdup(args);
 			if (string == NULL)
 				goto out_nomem;
+			kfree(mnt->mount_server.hostname);
 			mnt->mount_server.hostname = string;
 			break;
 		case Opt_mountaddr: