Commit 0c476a5d authored Nov 18, 2016 by Jeff Mahoney Committed by David Sterba Nov 30, 2016

btrfs: Ensure proper sector alignment for btrfs_free_reserved_data_space



This fixes the WARN_ON on BTRFS_I(inode)->reserved_extents in
btrfs_destroy_inode and the WARN_ON on nonzero delalloc bytes on umount
with qgroups enabled.

I was able to reproduce this by setting up a small (~500kb) quota limit
and writing a file one byte at a time until I hit the limit.  The warnings
would all hit on umount.

The root cause is that we would reserve a block-sized range in both
the reservation and the quota in btrfs_check_data_free_space, but if we
encountered a problem (like e.g. EDQUOT), we would only release the single
byte in the qgroup reservation.  That caused an iotree state split, which
increased the number of outstanding extents, in turn disallowing releasing
the metadata reservation.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent f94480bd

fs/btrfs/extent-tree.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -4322,6 +4322,13 @@ void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,
		*/
		void btrfs_free_reserved_data_space(struct inode *inode, u64 start, u64 len)
		{
		struct btrfs_root *root = BTRFS_I(inode)->root;

		/* Make sure the range is aligned to sectorsize */
		len = round_up(start + len, root->sectorsize) -
		round_down(start, root->sectorsize);
		start = round_down(start, root->sectorsize);

		btrfs_free_reserved_data_space_noquota(inode, start, len);
		btrfs_qgroup_free_data(inode, start, len);
		}

Admin message