diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-11-27 08:23:56 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2018-11-27 08:24:09 +0300 |
| commit | d608acfd4ac3fe17f3081bee8fcd4dcd896c2ffa (patch) | |
| tree | ade4450a72a2e358a1d2e5cde321de0097fb291c /fs/btrfs/disk-io.c | |
| parent | 62ccc3924eff37012bd0c227d8b7dc71188fc358 (diff) | |
| parent | a9da8725b7a744be3ff0ff44cab2547e4d1e6675 (diff) | |
| download | linux-dev-4.18.tar.xz | |
Merge tag 'v4.18.20' into dev-4.18dev-4.18
This is the 4.18.20 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 891b1aab3480..2012eaf80da5 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -4404,13 +4404,23 @@ static int btrfs_destroy_pinned_extent(struct btrfs_fs_info *fs_info, unpin = pinned_extents; again: while (1) { + /* + * The btrfs_finish_extent_commit() may get the same range as + * ours between find_first_extent_bit and clear_extent_dirty. + * Hence, hold the unused_bg_unpin_mutex to avoid double unpin + * the same extent range. + */ + mutex_lock(&fs_info->unused_bg_unpin_mutex); ret = find_first_extent_bit(unpin, 0, &start, &end, EXTENT_DIRTY, NULL); - if (ret) + if (ret) { + mutex_unlock(&fs_info->unused_bg_unpin_mutex); break; + } clear_extent_dirty(unpin, start, end); btrfs_error_unpin_extent_range(fs_info, start, end); + mutex_unlock(&fs_info->unused_bg_unpin_mutex); cond_resched(); } |