linux-next: manual merge of the btrfs tree with the btrfs-fixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the btrfs tree got a conflict in:

  fs/btrfs/compression.c

between commits:

  65ee6061388b3 ("btrfs: fix a bug that makes encoded write bio larger than expected")
  3adf8f14152fb ("btrfs: do not touch page cache for encoded writes")

from the btrfs-fixes tree and commits:

  c18bcdc0422e9 ("btrfs: reduce the size of compressed_bio")
  d634a62ed907c ("btrfs: do not touch page cache for encoded writes")
  bd2e495aacd58 ("btrfs: fix a bug that makes encoded write bio larger than expected")

from the btrfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined fs/btrfs/compression.c
index 85199944c1ebe,192f133d9eb58..0000000000000
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@@ -224,7 -224,6 +224,6 @@@ void btrfs_free_compr_folio(struct foli
  		return;
  
  free:
- 	ASSERT(folio_ref_count(folio) == 1);
  	folio_put(folio);
  }
  
@@@ -292,7 -291,7 +291,7 @@@ static void end_bbio_compressed_write(s
  	struct compressed_bio *cb = to_compressed_bio(bbio);
  	struct folio_iter fi;
  
- 	btrfs_finish_ordered_extent(cb->bbio.ordered, NULL, cb->start, cb->len,
+ 	btrfs_finish_ordered_extent(cb->bbio.ordered, cb->start, cb->len,
  				    cb->bbio.bio.bi_status == BLK_STS_OK);
  
  	if (cb->writeback)
@@@ -330,7 -329,6 +329,6 @@@ void btrfs_submit_compressed_write(stru
  	cb->start = ordered->file_offset;
  	cb->len = ordered->num_bytes;
  	ASSERT(cb->bbio.bio.bi_iter.bi_size == ordered->disk_num_bytes);
- 	cb->compressed_len = ordered->disk_num_bytes;
  	cb->bbio.bio.bi_iter.bi_sector = ordered->disk_bytenr >> SECTOR_SHIFT;
  	cb->bbio.ordered = ordered;
  
@@@ -560,7 -558,6 +558,6 @@@ void btrfs_submit_compressed_read(struc
  	em_start = em->start;
  
  	cb->len = bbio->bio.bi_iter.bi_size;
- 	cb->compressed_len = compressed_len;
  	cb->compress_type = btrfs_extent_map_compression(em);
  	cb->orig_bbio = bbio;
  	cb->bbio.csum_search_commit_root = bbio->csum_search_commit_root;

Attachment: signature.asc
Description: PGP signature