diff options
| author | Chris Mason <clm@fb.com> | 2015-12-15 09:09:59 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-12-15 09:09:59 -0800 |
| commit | 1d3a5a82fe724c53c472a18a31fb0bbf33dfaba2 (patch) | |
| tree | 992e3c8ba9681fafecd5c8ff9b8ca02ec9acea78 /fs/btrfs/extent-tree.c | |
| parent | bb1591b4ea1a1485ebc79be4e4748e94f96c670b (diff) | |
| parent | 94356889c404faf050895099fd0d23f8bef118c4 (diff) | |
Merge branch 'for-chris-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.4
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 4b89680a1923..c4661db2b72a 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -10480,11 +10480,15 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info) * until transaction commit to do the actual discard. */ if (trimming) { - WARN_ON(!list_empty(&block_group->bg_list)); - spin_lock(&trans->transaction->deleted_bgs_lock); + spin_lock(&fs_info->unused_bgs_lock); + /* + * A concurrent scrub might have added us to the list + * fs_info->unused_bgs, so use a list_move operation + * to add the block group to the deleted_bgs list. + */ list_move(&block_group->bg_list, &trans->transaction->deleted_bgs); - spin_unlock(&trans->transaction->deleted_bgs_lock); + spin_unlock(&fs_info->unused_bgs_lock); btrfs_get_block_group(block_group); } end_trans: |