aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-12 12:55:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-12 12:55:15 -0700
commitbe5090da4abb68caa69ac62ae5253ac540aa829a (patch)
treeebc520ca0afd7aecfeca7e1abbcd790c70bf73d8 /fs
parentd64dab903fb3abb42ef2a3fc2d8aa064105e5dca (diff)
parent6e4ea8e33b2057b85d75175dd89b93f5e26de3bc (diff)
downloadlinux-be5090da4abb68caa69ac62ae5253ac540aa829a.tar.gz
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')
-rw-r--r--fs/ext4/inode.c2
-rw-r--r--fs/ext4/xattr.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0d424d7ac02..e274e9c1171 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2563,7 +2563,7 @@ retry:
break;
}
blk_finish_plug(&plug);
- if (!ret && !cycled) {
+ if (!ret && !cycled && wbc->nr_to_write > 0) {
cycled = 1;
mpd.last_page = writeback_index - 1;
mpd.first_page = 0;
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index c081e34f717..03e9bebba19 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1350,6 +1350,8 @@ retry:
s_min_extra_isize) {
tried_min_extra_isize++;
new_extra_isize = s_min_extra_isize;
+ kfree(is); is = NULL;
+ kfree(bs); bs = NULL;
goto retry;
}
error = -1;