]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: remove hole check in prealloc_file_extent_cluster
authorNikolay Borisov <nborisov@suse.com>
Wed, 17 Jun 2020 09:10:42 +0000 (12:10 +0300)
committerDavid Sterba <dsterba@suse.com>
Mon, 27 Jul 2020 10:55:27 +0000 (12:55 +0200)
Extents in the extent cluster are guaranteed to be contiguous as such
the hole check inside the loop can never trigger. In fact this check was
never functional since it was added in a7ffa89de826 ("btrfs: update
btrfs_space_info's bytes_may_use timely") which came after the commit
introducing clustered/contiguous extents 5e906cb14963 ("Btrfs: relocate
file extents in clusters").

Let's just remove it as it adds noise to the source.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/relocation.c

index 9235c671bef875a7fab325f62148f95559dc4ab9..ade45fb4c49a152a5df6b03685ea4721158aca81 100644 (file)
@@ -2604,9 +2604,6 @@ int prealloc_file_extent_cluster(struct inode *inode,
 
                lock_extent(&BTRFS_I(inode)->io_tree, start, end);
                num_bytes = end + 1 - start;
-               if (cur_offset < start)
-                       btrfs_free_reserved_data_space_noquota(inode,
-                                                      start - cur_offset);
                ret = btrfs_prealloc_file_range(inode, 0, start,
                                                num_bytes, num_bytes,
                                                end + 1, &alloc_hint);