Commit 9b49ceb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fix from David Sterba:
 "One more fix that I think qualifies for a late merge. It's a revert of
  a one-liner fix that meanwhile got backported to stable kernels and we
  got reports from users.

  The broken fix prevents creating compressed inline extents, which
  could be noticeable on space consumption.

  Technically it's a regression as the patch was merged in 5.14-rc1 but
  got propagated to several stable kernels and has higher exposure than
  a 'typical' development cycle bug"

* tag 'for-5.14-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Revert "btrfs: compression: don't try to compress if we don't have enough pages"
parents 73f3af7b 4e965576

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ static noinline int compress_file_range(struct async_chunk *async_chunk) 
	 * inode has not been flagged as nocompress.  This flag can

	 * change at any time if we discover bad compression ratios.

	 */

	if (nr_pages > 1 && inode_need_compress(BTRFS_I(inode), start, end)) {

	if (inode_need_compress(BTRFS_I(inode), start, end)) {

		WARN_ON(pages);

		pages = kcalloc(nr_pages, sizeof(struct page *), GFP_NOFS);

		if (!pages) {