From fb6f4964fe524c58e1233e35cc9b54d0db9c1f48 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sat, 2 Mar 2013 17:13:55 -0500
Subject: [PATCH] --- yaml --- r: 360521 b: refs/heads/master c:
 3e36a16375eee390a9d80f99499fe630efa08128 h: refs/heads/master i:   360519:
 4291c0a152353a1b1641b0fd8815d6edcde2ec1f v: v3

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

diff --git a/[refs] b/[refs]
index 8ef4e9d26f4a..d3be15e5ec9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df05c1b85a88888b92725ef27ba70086f38fb083
+refs/heads/master: 3e36a16375eee390a9d80f99499fe630efa08128
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 1ae5860b30a3..6ac9c8a3eb08 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -4543,6 +4543,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
 			if (!old_opts.s_qf_names[i]) {
 				for (j = 0; j < i; j++)
 					kfree(old_opts.s_qf_names[j]);
+				kfree(orig_data);
 				return -ENOMEM;
 			}
 		} else