Commit eaea2947 authored Feb 17, 2020 by Linus Torvalds

linux

Pull btrfs fix from David Sterba:
 "This is the fix for sleeping in a locked section bug reported by Dave
  Jones, caused by a patch dependence in development and pulled
  branches.

  I picked the existing patch over the fixup that Filipe sent, as it's a
  bit more generic fix. I've verified it with a specific test case, some
  rsync stress and one round of fstests"

* tag 'for-5.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: don't set path->leave_spinning for truncate

parents 11a48a5a 52e29e33

fs/btrfs/inode.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -4142,7 +4142,6 @@ search_again:
		goto out;
		}

		path->leave_spinning = 1;
		ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
		if (ret < 0)
		goto out;
		@@ -4294,7 +4293,6 @@ delete:
		root == fs_info->tree_root)) {
		struct btrfs_ref ref = { 0 };

		btrfs_set_path_blocking(path);
		bytes_deleted += extent_num_bytes;

		btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF,

Admin message