btrfs: Use list_empty instead of list_empty_careful (81f1d390) · Commits · 戴 / test

list_empty_careful usually is a signal of something tricky going on. Its usage in btrfs is actually not needed since both lists it's used on are local to a function and cannot be modified concurrently. So switch to plain list_empty. No functional changes. Signed-off-by:

Nikolay Borisov <nborisov@suse.com> Reviewed-by:

David Sterba <dsterba@suse.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -10254,7 +10254,7 @@ out:
		btrfs_wait_and_free_delalloc_work(work);
		}

		if (!list_empty_careful(&splice)) {
		if (!list_empty(&splice)) {
		spin_lock(&root->delalloc_lock);
		list_splice_tail(&splice, &root->delalloc_inodes);
		spin_unlock(&root->delalloc_lock);
		@@ -10316,7 +10316,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput,

		ret = 0;
		out:
		if (!list_empty_careful(&splice)) {
		if (!list_empty(&splice)) {
		spin_lock(&fs_info->delalloc_root_lock);
		list_splice_tail(&splice, &fs_info->delalloc_roots);
		spin_unlock(&fs_info->delalloc_root_lock);

Admin message