diff options
author | Nikolay Borisov <nborisov@suse.com> | 2018-04-19 03:46:37 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-05-28 12:07:19 -0400 |
commit | 81f1d39035dfc58b265b3ad68e2dcbb61b7d8263 (patch) | |
tree | a2a9ed986efc5c6bb40db5ad8aa3fddfe30a6e76 /fs/btrfs/inode.c | |
parent | 2a3ff0adc92069122a75c3e37271d7ab7ce0dc1c (diff) |
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 <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
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: | |||
10254 | btrfs_wait_and_free_delalloc_work(work); | 10254 | btrfs_wait_and_free_delalloc_work(work); |
10255 | } | 10255 | } |
10256 | 10256 | ||
10257 | if (!list_empty_careful(&splice)) { | 10257 | if (!list_empty(&splice)) { |
10258 | spin_lock(&root->delalloc_lock); | 10258 | spin_lock(&root->delalloc_lock); |
10259 | list_splice_tail(&splice, &root->delalloc_inodes); | 10259 | list_splice_tail(&splice, &root->delalloc_inodes); |
10260 | spin_unlock(&root->delalloc_lock); | 10260 | spin_unlock(&root->delalloc_lock); |
@@ -10316,7 +10316,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput, | |||
10316 | 10316 | ||
10317 | ret = 0; | 10317 | ret = 0; |
10318 | out: | 10318 | out: |
10319 | if (!list_empty_careful(&splice)) { | 10319 | if (!list_empty(&splice)) { |
10320 | spin_lock(&fs_info->delalloc_root_lock); | 10320 | spin_lock(&fs_info->delalloc_root_lock); |
10321 | list_splice_tail(&splice, &fs_info->delalloc_roots); | 10321 | list_splice_tail(&splice, &fs_info->delalloc_roots); |
10322 | spin_unlock(&fs_info->delalloc_root_lock); | 10322 | spin_unlock(&fs_info->delalloc_root_lock); |