Commit 7e635452 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.16-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fix from David Sterba:
 "One more fix to the lzo code, a missing put_page causing memory leaks
  when some error branches are taken"

* tag 'for-5.16-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix the memory leak caused in lzo_compress_pages()
parents 1bff7d7e daf87e95

fs/btrfs/lzo.c

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ int lzo_compress_pages(struct list_head *ws, struct address_space *mapping, 
	*total_out = cur_out;

	*total_in = cur_in - start;

out:

	if (page_in)

		put_page(page_in);

	*out_pages = DIV_ROUND_UP(cur_out, PAGE_SIZE);

	return ret;

}