From: Nikolay Borisov Date: Thu, 19 Apr 2018 07:46:37 +0000 (+0300) Subject: btrfs: Use list_empty instead of list_empty_careful X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=81f1d39035dfc58b265b3ad68e2dcbb61b7d8263;p=openwrt%2Fstaging%2Fblogic.git btrfs: Use list_empty instead of list_empty_careful 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 Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 53ba8e8f1148..0aadf17c528f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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);