Commit be5090da authored by Linus Torvalds's avatar Linus Torvalds

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
parents d64dab90 6e4ea8e3
...@@ -2563,7 +2563,7 @@ static int ext4_writepages(struct address_space *mapping, ...@@ -2563,7 +2563,7 @@ static int ext4_writepages(struct address_space *mapping,
break; break;
} }
blk_finish_plug(&plug); blk_finish_plug(&plug);
if (!ret && !cycled) { if (!ret && !cycled && wbc->nr_to_write > 0) {
cycled = 1; cycled = 1;
mpd.last_page = writeback_index - 1; mpd.last_page = writeback_index - 1;
mpd.first_page = 0; mpd.first_page = 0;
......
...@@ -1350,6 +1350,8 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, ...@@ -1350,6 +1350,8 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
s_min_extra_isize) { s_min_extra_isize) {
tried_min_extra_isize++; tried_min_extra_isize++;
new_extra_isize = s_min_extra_isize; new_extra_isize = s_min_extra_isize;
kfree(is); is = NULL;
kfree(bs); bs = NULL;
goto retry; goto retry;
} }
error = -1; error = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment