diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-12 15:55:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-12 15:55:15 -0400 |
commit | be5090da4abb68caa69ac62ae5253ac540aa829a (patch) | |
tree | ebc520ca0afd7aecfeca7e1abbcd790c70bf73d8 /fs/ext4/xattr.c | |
parent | d64dab903fb3abb42ef2a3fc2d8aa064105e5dca (diff) | |
parent | 6e4ea8e33b2057b85d75175dd89b93f5e26de3bc (diff) |
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bugfixes from Ted Ts'o:
"A bug fix and performance regression fix for ext4"
* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix memory leak in xattr
ext4: fix performance regression in writeback of random writes
Diffstat (limited to 'fs/ext4/xattr.c')
-rw-r--r-- | fs/ext4/xattr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index c081e34f717f..03e9bebba198 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c | |||
@@ -1350,6 +1350,8 @@ retry: | |||
1350 | s_min_extra_isize) { | 1350 | s_min_extra_isize) { |
1351 | tried_min_extra_isize++; | 1351 | tried_min_extra_isize++; |
1352 | new_extra_isize = s_min_extra_isize; | 1352 | new_extra_isize = s_min_extra_isize; |
1353 | kfree(is); is = NULL; | ||
1354 | kfree(bs); bs = NULL; | ||
1353 | goto retry; | 1355 | goto retry; |
1354 | } | 1356 | } |
1355 | error = -1; | 1357 | error = -1; |