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

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

Pull btrfs fixes from David Sterba:

 - regression where properties stored as xattrs are not properly
   persisted

 - a small readahead fix (the fstests testcase for that fix hangs on
   unpatched kernel, so we'd like get it merged to ease future testing)

 - fix a race during block group creation and deletion

* tag 'for-5.2-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix failure to persist compression property xattr deletion on fsync
  btrfs: start readahead also in seed devices
  Btrfs: fix race between block group removal and block group allocation
parents 7b306892 3763771c

fs/btrfs/extent-tree.c

+13 −11
Original line number Diff line number Diff line
@@ -10831,17 +10831,6 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, 
	remove_em = (atomic_read(&block_group->trimming) == 0);

	spin_unlock(&block_group->lock);



	if (remove_em) {

		struct extent_map_tree *em_tree;



		em_tree = &fs_info->mapping_tree.map_tree;

		write_lock(&em_tree->lock);

		remove_extent_mapping(em_tree, em);

		write_unlock(&em_tree->lock);

		/* once for the tree */

		free_extent_map(em);

	}



	mutex_unlock(&fs_info->chunk_mutex);



	ret = remove_block_group_free_space(trans, block_group);
@@ -10858,6 +10847,19 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, 
		goto out;



	ret = btrfs_del_item(trans, root, path);

	if (ret)

		goto out;



	if (remove_em) {

		struct extent_map_tree *em_tree;



		em_tree = &fs_info->mapping_tree.map_tree;

		write_lock(&em_tree->lock);

		remove_extent_mapping(em_tree, em);

		write_unlock(&em_tree->lock);

		/* once for the tree */

		free_extent_map(em);

	}

out:

	if (remove_rsv)

		btrfs_delayed_refs_rsv_release(fs_info, 1);

fs/btrfs/ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -312,8 +312,6 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) 
			btrfs_abort_transaction(trans, ret);

			goto out_end_trans;

		}

		set_bit(BTRFS_INODE_COPY_EVERYTHING,

			&BTRFS_I(inode)->runtime_flags);

	} else {

		ret = btrfs_set_prop(trans, inode, "btrfs.compression", NULL,

				     0, 0);

fs/btrfs/reada.c

+5 −0
Original line number Diff line number Diff line
@@ -747,6 +747,7 @@ static void __reada_start_machine(struct btrfs_fs_info *fs_info) 
	u64 total = 0;

	int i;



again:

	do {

		enqueued = 0;

		mutex_lock(&fs_devices->device_list_mutex);
@@ -758,6 +759,10 @@ static void __reada_start_machine(struct btrfs_fs_info *fs_info) 
		mutex_unlock(&fs_devices->device_list_mutex);

		total += enqueued;

	} while (enqueued && total < 10000);

	if (fs_devices->seed) {

		fs_devices = fs_devices->seed;

		goto again;

	}



	if (enqueued == 0)

		return;

fs/btrfs/xattr.c

+3 −3
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode, 
	}

out:

	btrfs_free_path(path);

	if (!ret)

		set_bit(BTRFS_INODE_COPY_EVERYTHING,

			&BTRFS_I(inode)->runtime_flags);

	return ret;

}
@@ -236,7 +239,6 @@ int btrfs_setxattr_trans(struct inode *inode, const char *name, 


	inode_inc_iversion(inode);

	inode->i_ctime = current_time(inode);

	set_bit(BTRFS_INODE_COPY_EVERYTHING, &BTRFS_I(inode)->runtime_flags);

	ret = btrfs_update_inode(trans, root, inode);

	BUG_ON(ret);

out:
@@ -388,8 +390,6 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler, 
	if (!ret) {

		inode_inc_iversion(inode);

		inode->i_ctime = current_time(inode);

		set_bit(BTRFS_INODE_COPY_EVERYTHING,

			&BTRFS_I(inode)->runtime_flags);

		ret = btrfs_update_inode(trans, root, inode);

		BUG_ON(ret);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE