]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: Use list_empty instead of list_empty_careful
authorNikolay Borisov <nborisov@suse.com>
Thu, 19 Apr 2018 07:46:37 +0000 (10:46 +0300)
committerDavid Sterba <dsterba@suse.com>
Mon, 28 May 2018 16:07:19 +0000 (18:07 +0200)
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

index 53ba8e8f1148449b153690689be4d01baa70b079..0aadf17c528febd7f06340d187ac31df5d5220f4 100644 (file)
@@ -10254,7 +10254,7 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput,
                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);