]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: free qgroup rsv on io failure
authorBoris Burkov <boris@bur.io>
Fri, 21 Jul 2023 16:02:06 +0000 (09:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Sep 2023 10:28:06 +0000 (12:28 +0200)
commit e28b02118b94e42be3355458a2406c6861e2dd32 upstream.

If we do a write whose bio suffers an error, we will never reclaim the
qgroup reserved space for it. We allocate the space in the write_iter
codepath, then release the reservation as we allocate the ordered
extent, but we only create a delayed ref if the ordered extent finishes.
If it has an error, we simply leak the rsv. This is apparent in running
any error injecting (dmerror) fstests like btrfs/146 or btrfs/160. Such
tests fail due to dmesg on umount complaining about the leaked qgroup
data space.

When we clean up other aspects of space on failed ordered_extents, also
free the qgroup rsv.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
CC: stable@vger.kernel.org # 5.10+
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>
fs/btrfs/inode.c

index 28bcba2e059080e9a61e5a241c95802252f2b3ce..222068bf80031479ccc0c7639a8078485d63460d 100644 (file)
@@ -3393,6 +3393,13 @@ out:
                        btrfs_free_reserved_extent(fs_info,
                                        ordered_extent->disk_bytenr,
                                        ordered_extent->disk_num_bytes, 1);
+                       /*
+                        * Actually free the qgroup rsv which was released when
+                        * the ordered extent was created.
+                        */
+                       btrfs_qgroup_free_refroot(fs_info, inode->root->root_key.objectid,
+                                                 ordered_extent->qgroup_rsv,
+                                                 BTRFS_QGROUP_RSV_DATA);
                }
        }