| Message ID | 860ef499b2c45e2798267dd323b1b991c2bac79a.1688597211.git.boris@bur.io (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: simple quotas | expand |
On Wed, Jul 05, 2023 at 04:20:38PM -0700, Boris Burkov wrote: > 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. > > Signed-off-by: Boris Burkov <boris@bur.io> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Thanks, Josef
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index dbbb67293e34..1984e140ca46 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3359,6 +3359,13 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) 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); } }
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. Signed-off-by: Boris Burkov <boris@bur.io> --- fs/btrfs/inode.c | 7 +++++++ 1 file changed, 7 insertions(+)