ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Browse Source 
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
This commit is contained in:
Linus Torvalds
2013-10-12 12:55:15 -07:00
parent d64dab903f 6e4ea8e33b
commit be5090da4a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext4/inode.c
View File

@@ -2563,7 +2563,7 @@ retry:
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;

2
fs/ext4/xattr.c
View File

@@ -1350,6 +1350,8 @@ retry:
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;