Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be5090da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/ext4/xattr.c

+2 −0
Original line number Diff line number Diff line
@@ -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;