btrfs: call btrfs_try_granting_tickets when unpinning anything
authorJosef Bacik <josef@toxicpanda.com>
Tue, 21 Jul 2020 14:22:18 +0000 (10:22 -0400)
committerDavid Sterba <dsterba@suse.com>
Wed, 7 Oct 2020 10:06:51 +0000 (12:06 +0200)
When unpinning we were only calling btrfs_try_granting_tickets() if
global_rsv->space_info == space_info, which is problematic because we
use ticketing for SYSTEM chunks, and want to use it for DATA as well.
Fix this by moving this call outside of that if statement.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent-tree.c

index dbff61d36cab4d7a6700ce86c51b6036683abaa1..79c4432e6a3faf7dea7859623c6b02f717b6eb8b 100644 (file)
@@ -2849,11 +2849,10 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,
                                len -= to_add;
                        }
                        spin_unlock(&global_rsv->lock);
-                       /* Add to any tickets we may have */
-                       if (len)
-                               btrfs_try_granting_tickets(fs_info,
-                                                          space_info);
                }
+               /* Add to any tickets we may have */
+               if (!readonly && return_free_space && len)
+                       btrfs_try_granting_tickets(fs_info, space_info);
                spin_unlock(&space_info->lock);
        }