diff options
| author | Robbie Ko <robbieko@synology.com> | 2016-10-07 10:01:29 +0800 |
|---|---|---|
| committer | Filipe Manana <fdmanana@suse.com> | 2017-01-28 17:15:55 +0000 |
| commit | ee2e5d0a45d03d4046561bb4a5d98a5609eab4e0 (patch) | |
| tree | 939d89bf0f40a86c3fff10df2346e22785e7ef10 /fs/btrfs | |
| parent | 878db2b59415e0be9fd5dd8683e357314163f24b (diff) | |
Btrfs: fix leak of subvolume writers counter
When falling back from a nocow write to a regular cow write, we were
leaking the subvolume writers counter in 2 situations, preventing
snapshot creation from ever completing in the future, as it waits
for that counter to go down to zero before the snapshot creation
starts.
Signed-off-by: Robbie Ko <robbieko@synology.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
[Improved changelog and subject]
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8a8e719778bd..8eb6703e58e0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1404,10 +1404,16 @@ next_slot: * either valid or do not exist. */ if (csum_exist_in_range(fs_info, disk_bytenr, - num_bytes)) + num_bytes)) { + if (!nolock) + btrfs_end_write_no_snapshoting(root); goto out_check; - if (!btrfs_inc_nocow_writers(fs_info, disk_bytenr)) + } + if (!btrfs_inc_nocow_writers(fs_info, disk_bytenr)) { + if (!nolock) + btrfs_end_write_no_snapshoting(root); goto out_check; + } nocow = 1; } else if (extent_type == BTRFS_FILE_EXTENT_INLINE) { extent_end = found_key.offset + |