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

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

Pull btrfs fixes from David Sterba:

 - fix potential overflow in returned value from SEARCH_TREE_V2
   ioctl on 32bit architecture

 - zoned mode fixes:

     - drop unnecessary write pointer check for RAID0/RAID1/RAID10
       profiles, now it works because of raid-stripe-tree

     - wait for finishing the zone when direct IO needs a new
       allocation

 - simple quota fixes:

     - pass correct owning root pointer when cleaning up an
       aborted transaction

     - fix leaking some structures when processing delayed refs

     - change key type number of BTRFS_EXTENT_OWNER_REF_KEY,
       reorder it before inline refs that are supposed to be
       sorted, keeping the original number would complicate a lot
       of things; this change needs an updated version of
       btrfs-progs to work and filesystems need to be recreated

 - fix error pointer dereference after failure to allocate fs
   devices

 - fix race between accounting qgroup extents and removing a
   qgroup

* tag 'for-6.7-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: make OWNER_REF_KEY type value smallest among inline refs
  btrfs: fix qgroup record leaks when using simple quotas
  btrfs: fix race between accounting qgroup extents and removing a qgroup
  btrfs: fix error pointer dereference after failure to allocate fs devices
  btrfs: make found_logical_ret parameter mandatory for function queue_scrub_stripe()
  btrfs: get correct owning_root when dropping snapshot
  btrfs: zoned: wait for data BG to be finished on direct IO allocation
  btrfs: zoned: drop no longer valid write pointer check
  btrfs: directly return 0 on no error code in btrfs_insert_raid_extent()
  btrfs: use u64 for buffer sizes in the tree search ioctls
parents 58c09cad d3933152

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, 
	if (btrfs_block_can_be_shared(trans, root, buf)) {

		ret = btrfs_lookup_extent_info(trans, fs_info, buf->start,

					       btrfs_header_level(buf), 1,

					       &refs, &flags);

					       &refs, &flags, NULL);

		if (ret)

			return ret;

		if (unlikely(refs == 0)) {

fs/btrfs/delayed-ref.c

+2 −2
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
		return -ENOMEM;

	}



	if (btrfs_qgroup_enabled(fs_info) && !generic_ref->skip_qgroup) {

	if (btrfs_qgroup_full_accounting(fs_info) && !generic_ref->skip_qgroup) {

		record = kzalloc(sizeof(*record), GFP_NOFS);

		if (!record) {

			kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
@@ -1144,7 +1144,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans, 
		return -ENOMEM;

	}



	if (btrfs_qgroup_enabled(fs_info) && !generic_ref->skip_qgroup) {

	if (btrfs_qgroup_full_accounting(fs_info) && !generic_ref->skip_qgroup) {

		record = kzalloc(sizeof(*record), GFP_NOFS);

		if (!record) {

			kmem_cache_free(btrfs_delayed_data_ref_cachep, ref);

fs/btrfs/extent-tree.c

+17 −8
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ int btrfs_lookup_data_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len) 
 */

int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info, u64 bytenr,

			     u64 offset, int metadata, u64 *refs, u64 *flags)

			     u64 offset, int metadata, u64 *refs, u64 *flags,

			     u64 *owning_root)

{

	struct btrfs_root *extent_root;

	struct btrfs_delayed_ref_head *head;
@@ -114,6 +115,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, 
	u32 item_size;

	u64 num_refs;

	u64 extent_flags;

	u64 owner = 0;

	int ret;



	/*
@@ -167,6 +169,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, 
					    struct btrfs_extent_item);

			num_refs = btrfs_extent_refs(leaf, ei);

			extent_flags = btrfs_extent_flags(leaf, ei);

			owner = btrfs_get_extent_owner_root(fs_info, leaf,

							    path->slots[0]);

		} else {

			ret = -EUCLEAN;

			btrfs_err(fs_info,
@@ -226,6 +230,8 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, 
		*refs = num_refs;

	if (flags)

		*flags = extent_flags;

	if (owning_root)

		*owning_root = owner;

out_free:

	btrfs_free_path(path);

	return ret;
@@ -5234,7 +5240,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans, 
		/* We don't lock the tree block, it's OK to be racy here */

		ret = btrfs_lookup_extent_info(trans, fs_info, bytenr,

					       wc->level - 1, 1, &refs,

					       &flags);

					       &flags, NULL);

		/* We don't care about errors in readahead. */

		if (ret < 0)

			continue;
@@ -5301,7 +5307,8 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans, 
		ret = btrfs_lookup_extent_info(trans, fs_info,

					       eb->start, level, 1,

					       &wc->refs[level],

					       &wc->flags[level]);

					       &wc->flags[level],

					       NULL);

		BUG_ON(ret == -ENOMEM);

		if (ret)

			return ret;
@@ -5391,6 +5398,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
	u64 bytenr;

	u64 generation;

	u64 parent;

	u64 owner_root = 0;

	struct btrfs_tree_parent_check check = { 0 };

	struct btrfs_key key;

	struct btrfs_ref ref = { 0 };
@@ -5434,7 +5442,8 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 


	ret = btrfs_lookup_extent_info(trans, fs_info, bytenr, level - 1, 1,

				       &wc->refs[level - 1],

				       &wc->flags[level - 1]);

				       &wc->flags[level - 1],

				       &owner_root);

	if (ret < 0)

		goto out_unlock;
@@ -5567,8 +5576,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
		find_next_key(path, level, &wc->drop_progress);



		btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF, bytenr,

				       fs_info->nodesize, parent,

				       btrfs_header_owner(next));

				       fs_info->nodesize, parent, owner_root);

		btrfs_init_tree_ref(&ref, level - 1, root->root_key.objectid,

				    0, false);

		ret = btrfs_free_extent(trans, &ref);
@@ -5635,7 +5643,8 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, 
			ret = btrfs_lookup_extent_info(trans, fs_info,

						       eb->start, level, 1,

						       &wc->refs[level],

						       &wc->flags[level]);

						       &wc->flags[level],

						       NULL);

			if (ret < 0) {

				btrfs_tree_unlock_rw(eb, path->locks[level]);

				path->locks[level] = 0;
@@ -5880,7 +5889,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc) 
			ret = btrfs_lookup_extent_info(trans, fs_info,

						path->nodes[level]->start,

						level, 1, &wc->refs[level],

						&wc->flags[level]);

						&wc->flags[level], NULL);

			if (ret < 0) {

				err = ret;

				goto out_end_trans;

fs/btrfs/extent-tree.h

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ u64 btrfs_cleanup_ref_head_accounting(struct btrfs_fs_info *fs_info, 
int btrfs_lookup_data_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len);

int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info, u64 bytenr,

			     u64 offset, int metadata, u64 *refs, u64 *flags);

			     u64 offset, int metadata, u64 *refs, u64 *flags,

			     u64 *owner_root);

int btrfs_pin_extent(struct btrfs_trans_handle *trans, u64 bytenr, u64 num,

		     int reserved);

int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans,

fs/btrfs/inode.c

+7 −0
Original line number Diff line number Diff line
@@ -6983,8 +6983,15 @@ static struct extent_map *btrfs_new_extent_direct(struct btrfs_inode *inode, 
	int ret;



	alloc_hint = get_extent_allocation_hint(inode, start, len);

again:

	ret = btrfs_reserve_extent(root, len, len, fs_info->sectorsize,

				   0, alloc_hint, &ins, 1, 1);

	if (ret == -EAGAIN) {

		ASSERT(btrfs_is_zoned(fs_info));

		wait_on_bit_io(&inode->root->fs_info->flags, BTRFS_FS_NEED_ZONE_FINISH,

			       TASK_UNINTERRUPTIBLE);

		goto again;

	}

	if (ret)

		return ERR_PTR(ret);