Commit 12e6cced authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:

 - fix infinite loop in readdir(), could happen in a big directory when
   files get renamed during enumeration

 - fix extent map handling of skipped pinned ranges

 - fix a corner case when handling ordered extent length

 - fix a potential crash when balance cancel races with pause

 - verify correct uuid when starting scrub or device replace

* tag 'for-6.5-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix incorrect splitting in btrfs_drop_extent_map_range
  btrfs: fix BUG_ON condition in btrfs_cancel_balance
  btrfs: only subtract from len_to_oe_boundary when it is tracking an extent
  btrfs: fix replace/scrub failure with metadata_uuid
  btrfs: fix infinite directory reads
parents b5cab28b c962098c

fs/btrfs/ctree.h

+1 −0
Original line number Diff line number Diff line
@@ -443,6 +443,7 @@ struct btrfs_drop_extents_args { 


struct btrfs_file_private {

	void *filldir_buf;

	u64 last_index;

	struct extent_state *llseek_cached_state;

};

fs/btrfs/delayed-inode.c

+3 −2
Original line number Diff line number Diff line
@@ -1632,6 +1632,7 @@ int btrfs_inode_delayed_dir_index_count(struct btrfs_inode *inode) 
}



bool btrfs_readdir_get_delayed_items(struct inode *inode,

				     u64 last_index,

				     struct list_head *ins_list,

				     struct list_head *del_list)

{
@@ -1651,14 +1652,14 @@ bool btrfs_readdir_get_delayed_items(struct inode *inode, 


	mutex_lock(&delayed_node->mutex);

	item = __btrfs_first_delayed_insertion_item(delayed_node);

	while (item) {

	while (item && item->index <= last_index) {

		refcount_inc(&item->refs);

		list_add_tail(&item->readdir_list, ins_list);

		item = __btrfs_next_delayed_item(item);

	}



	item = __btrfs_first_delayed_deletion_item(delayed_node);

	while (item) {

	while (item && item->index <= last_index) {

		refcount_inc(&item->refs);

		list_add_tail(&item->readdir_list, del_list);

		item = __btrfs_next_delayed_item(item);

fs/btrfs/delayed-inode.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ void btrfs_destroy_delayed_inodes(struct btrfs_fs_info *fs_info); 


/* Used for readdir() */

bool btrfs_readdir_get_delayed_items(struct inode *inode,

				     u64 last_index,

				     struct list_head *ins_list,

				     struct list_head *del_list);

void btrfs_readdir_put_delayed_items(struct inode *inode,

fs/btrfs/extent_io.c

+24 −1
Original line number Diff line number Diff line
@@ -902,6 +902,29 @@ static void submit_extent_page(struct btrfs_bio_ctrl *bio_ctrl, 
		size -= len;

		pg_offset += len;

		disk_bytenr += len;



		/*

		 * len_to_oe_boundary defaults to U32_MAX, which isn't page or

		 * sector aligned.  alloc_new_bio() then sets it to the end of

		 * our ordered extent for writes into zoned devices.

		 *

		 * When len_to_oe_boundary is tracking an ordered extent, we

		 * trust the ordered extent code to align things properly, and

		 * the check above to cap our write to the ordered extent

		 * boundary is correct.

		 *

		 * When len_to_oe_boundary is U32_MAX, the cap above would

		 * result in a 4095 byte IO for the last page right before

		 * we hit the bio limit of UINT_MAX.  bio_add_page() has all

		 * the checks required to make sure we don't overflow the bio,

		 * and we should just ignore len_to_oe_boundary completely

		 * unless we're using it to track an ordered extent.

		 *

		 * It's pretty hard to make a bio sized U32_MAX, but it can

		 * happen when the page cache is able to feed us contiguous

		 * pages for large extents.

		 */

		if (bio_ctrl->len_to_oe_boundary != U32_MAX)

			bio_ctrl->len_to_oe_boundary -= len;



		/* Ordered extent boundary: move on to a new bio. */

fs/btrfs/extent_map.c

+2 −4
Original line number Diff line number Diff line
@@ -760,8 +760,6 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end, 


		if (skip_pinned && test_bit(EXTENT_FLAG_PINNED, &em->flags)) {

			start = em_end;

			if (end != (u64)-1)

				len = start + len - em_end;

			goto next;

		}
@@ -829,8 +827,8 @@ void btrfs_drop_extent_map_range(struct btrfs_inode *inode, u64 start, u64 end, 
				if (!split)

					goto remove_em;

			}

			split->start = start + len;

			split->len = em_end - (start + len);

			split->start = end;

			split->len = em_end - end;

			split->block_start = em->block_start;

			split->flags = flags;

			split->compress_type = em->compress_type;