Skip to content

Commit a7f8b1c

Browse files
adam900710kdave
authored andcommitted
btrfs: file: reserve qgroup space after the hole punch range is locked
The incoming qgroup reserved space timing will move the data reservation to ordered extent completely. However in btrfs_punch_hole_lock_range() will call btrfs_invalidate_page(), which will clear QGROUP_RESERVED bit for the range. In current stage it's OK, but if we're making ordered extents handle the reserved space, then btrfs_punch_hole_lock_range() can clear the QGROUP_RESERVED bit before we submit ordered extent, leading to qgroup reserved space leakage. So here change the timing to make reserve data space after btrfs_punch_hole_lock_range(). The new timing is fine for either current code or the new code. Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 9729f10 commit a7f8b1c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

fs/btrfs/file.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3174,14 +3174,14 @@ static int btrfs_zero_range(struct inode *inode,
31743174
if (ret < 0)
31753175
goto out;
31763176
space_reserved = true;
3177-
ret = btrfs_qgroup_reserve_data(inode, &data_reserved,
3178-
alloc_start, bytes_to_reserve);
3179-
if (ret)
3180-
goto out;
31813177
ret = btrfs_punch_hole_lock_range(inode, lockstart, lockend,
31823178
&cached_state);
31833179
if (ret)
31843180
goto out;
3181+
ret = btrfs_qgroup_reserve_data(inode, &data_reserved,
3182+
alloc_start, bytes_to_reserve);
3183+
if (ret)
3184+
goto out;
31853185
ret = btrfs_prealloc_file_range(inode, mode, alloc_start,
31863186
alloc_end - alloc_start,
31873187
i_blocksize(inode),

0 commit comments

Comments
 (0)