Commit f0fddcec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:
 "A few fixes and one patch to help some block layer API cleanups:

   - skip missing device when running fstrim

   - fix unpersisted i_size on fsync after expanding truncate

   - fix lock inversion problem when doing qgroup extent tracing

   - replace bdgrab/bdput usage, replace gendisk by block_device"

* tag 'for-5.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: store a block_device in struct btrfs_ordered_extent
  btrfs: fix lock inversion problem when doing qgroup extent tracing
  btrfs: check for missing device in btrfs_trim_fs
  btrfs: fix unpersisted i_size on fsync after expanding truncate
parents 704f4cba c7c3a6dc

fs/btrfs/backref.c

+3 −3
Original line number Diff line number Diff line
@@ -1488,15 +1488,15 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans, 
int btrfs_find_all_roots(struct btrfs_trans_handle *trans,

			 struct btrfs_fs_info *fs_info, u64 bytenr,

			 u64 time_seq, struct ulist **roots,

			 bool ignore_offset)

			 bool ignore_offset, bool skip_commit_root_sem)

{

	int ret;



	if (!trans)

	if (!trans && !skip_commit_root_sem)

		down_read(&fs_info->commit_root_sem);

	ret = btrfs_find_all_roots_safe(trans, fs_info, bytenr,

					time_seq, roots, ignore_offset);

	if (!trans)

	if (!trans && !skip_commit_root_sem)

		up_read(&fs_info->commit_root_sem);

	return ret;

}

fs/btrfs/backref.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ int btrfs_find_all_leafs(struct btrfs_trans_handle *trans, 
			 const u64 *extent_item_pos, bool ignore_offset);

int btrfs_find_all_roots(struct btrfs_trans_handle *trans,

			 struct btrfs_fs_info *fs_info, u64 bytenr,

			 u64 time_seq, struct ulist **roots, bool ignore_offset);

			 u64 time_seq, struct ulist **roots, bool ignore_offset,

			 bool skip_commit_root_sem);

char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,

			u32 name_len, unsigned long name_off,

			struct extent_buffer *eb_in, u64 parent,

fs/btrfs/delayed-ref.c

+2 −2
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
		kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);



	if (qrecord_inserted)

		btrfs_qgroup_trace_extent_post(fs_info, record);

		btrfs_qgroup_trace_extent_post(trans, record);



	return 0;

}
@@ -1069,7 +1069,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans, 




	if (qrecord_inserted)

		return btrfs_qgroup_trace_extent_post(fs_info, record);

		return btrfs_qgroup_trace_extent_post(trans, record);

	return 0;

}

fs/btrfs/extent-tree.c

+3 −0
Original line number Diff line number Diff line
@@ -6019,6 +6019,9 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) 
	mutex_lock(&fs_info->fs_devices->device_list_mutex);

	devices = &fs_info->fs_devices->devices;

	list_for_each_entry(device, devices, dev_list) {

		if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state))

			continue;



		ret = btrfs_trim_free_extents(device, &group_trimmed);

		if (ret) {

			dev_failed++;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2992,7 +2992,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
		goto out;

	}



	if (ordered_extent->disk)

	if (ordered_extent->bdev)

		btrfs_rewrite_logical_zoned(ordered_extent);



	btrfs_free_io_failure_record(inode, start, end);