Commit 6f513529 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:
 "A few more regression fixes and stable patches, mostly one-liners.

  Regression fixes:

   - fix pointer/ERR_PTR mismatch returned from memdup_user

   - reset dedicated zoned mode relocation block group to avoid using it
     and filling it without any recourse

  Fixes:

   - handle a case to FITRIM range (also to make fstests/generic/260
     work)

   - fix warning when extent buffer state and pages get out of sync
     after an IO error

   - fix transaction abort when syncing due to missing mapping error set
     on metadata inode after inlining a compressed file

   - fix transaction abort due to tree-log and zoned mode interacting in
     an unexpected way

   - fix memory leak of additional extent data when qgroup reservation
     fails

   - do proper handling of slot search call when deleting root refs"

* tag 'for-5.16-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling
  btrfs: zoned: clear data relocation bg on zone finish
  btrfs: free exchange changeset on failures
  btrfs: fix re-dirty process of tree-log nodes
  btrfs: call mapping_set_error() on btree inode with a write error
  btrfs: clear extent buffer uptodate when we fail to write it
  btrfs: fail if fstrim_range->start == U64_MAX
  btrfs: fix error pointer dereference in btrfs_ioctl_rm_dev_v2()
parents e1b96811 8289ed9f

fs/btrfs/delalloc-space.c

+9 −3
Original line number Diff line number Diff line
@@ -143,10 +143,13 @@ int btrfs_check_data_free_space(struct btrfs_inode *inode, 


	/* Use new btrfs_qgroup_reserve_data to reserve precious data space. */

	ret = btrfs_qgroup_reserve_data(inode, reserved, start, len);

	if (ret < 0)

	if (ret < 0) {

		btrfs_free_reserved_data_space_noquota(fs_info, len);

	else

		extent_changeset_free(*reserved);

		*reserved = NULL;

	} else {

		ret = 0;

	}

	return ret;

}
@@ -452,8 +455,11 @@ int btrfs_delalloc_reserve_space(struct btrfs_inode *inode, 
	if (ret < 0)

		return ret;

	ret = btrfs_delalloc_reserve_metadata(inode, len);

	if (ret < 0)

	if (ret < 0) {

		btrfs_free_reserved_data_space(inode, *reserved, start, len);

		extent_changeset_free(*reserved);

		*reserved = NULL;

	}

	return ret;

}

fs/btrfs/extent-tree.c

+3 −0
Original line number Diff line number Diff line
@@ -6051,6 +6051,9 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) 
	int dev_ret = 0;

	int ret = 0;



	if (range->start == U64_MAX)

		return -EINVAL;



	/*

	 * Check range overflow if range->len is set.

	 * The default range->len is U64_MAX.

fs/btrfs/extent_io.c

+14 −0
Original line number Diff line number Diff line
@@ -4313,6 +4313,20 @@ static void set_btree_ioerr(struct page *page, struct extent_buffer *eb) 
	if (test_and_set_bit(EXTENT_BUFFER_WRITE_ERR, &eb->bflags))

		return;



	/*

	 * A read may stumble upon this buffer later, make sure that it gets an

	 * error and knows there was an error.

	 */

	clear_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);



	/*

	 * We need to set the mapping with the io error as well because a write

	 * error will flip the file system readonly, and then syncfs() will

	 * return a 0 because we are readonly if we don't modify the err seq for

	 * the superblock.

	 */

	mapping_set_error(page->mapping, -EIO);



	/*

	 * If we error out, we should add back the dirty_metadata_bytes

	 * to make it consistent.

fs/btrfs/ioctl.c

+2 −4
Original line number Diff line number Diff line
@@ -3187,10 +3187,8 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) 
		return -EPERM;



	vol_args = memdup_user(arg, sizeof(*vol_args));

	if (IS_ERR(vol_args)) {

		ret = PTR_ERR(vol_args);

		goto out;

	}

	if (IS_ERR(vol_args))

		return PTR_ERR(vol_args);



	if (vol_args->flags & ~BTRFS_DEVICE_REMOVE_ARGS_MASK) {

		ret = -EOPNOTSUPP;

fs/btrfs/root-tree.c

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
	key.offset = ref_id;

again:

	ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1);

	BUG_ON(ret < 0);

	if (ret < 0)

		goto out;

	if (ret == 0) {

		leaf = path->nodes[0];

		ref = btrfs_item_ptr(leaf, path->slots[0],