btrfs: free qgroup reserve when ORDERED_IOERR is set

commit f63e1164b90b385cd832ff0fdfcfa76c3cc15436 upstream.

An ordered extent completing is a critical moment in qgroup reserve
handling, as the ownership of the reservation is handed off from the
ordered extent to the delayed ref. In the happy path we release (unlock)
but do not free (decrement counter) the reservation, and the delayed ref
drives the free. However, on an error, we don't create a delayed ref,
since there is no ref to add. Therefore, free on the error path.

CC: stable@vger.kernel.org # 6.1+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 345c449..0fa0bc1 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -603,7 +603,9 @@ void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,
                        release = entry->disk_num_bytes;
                else
                        release = entry->num_bytes;
-               btrfs_delalloc_release_metadata(btrfs_inode, release, false);
+               btrfs_delalloc_release_metadata(btrfs_inode, release,
+                                               test_bit(BTRFS_ORDERED_IOERR,
+                                                        &entry->flags));
        }
 
        percpu_counter_add_batch(&fs_info->ordered_bytes, -entry->num_bytes,