Commit a970b0a1 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: account for space we may use in fallocate 



Using Eric Sandeen's xfstest for fallocate, you can easily trigger a ENOSPC
panic on btrfs.  This is because we do not account for data we may use when
doing the fallocate.  This patch fixes the problem by properly reserving space,
and then just freeing it when we are done.  The reservation stuff was made with
delalloc in mind, so its a little crude for this case, but it keeps the box
from panicing.

Signed-off-by: default avatarJosef Bacik <jbacik@redhat.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent c8a894d7

fs/btrfs/inode.c

+11 −1
Original line number Diff line number Diff line
@@ -5103,6 +5103,7 @@ static long btrfs_fallocate(struct inode *inode, int mode, 
	u64 mask = BTRFS_I(inode)->root->sectorsize - 1;

	struct extent_map *em;

	struct btrfs_trans_handle *trans;

	struct btrfs_root *root;

	int ret;



	alloc_start = offset & ~mask;
@@ -5121,6 +5122,13 @@ static long btrfs_fallocate(struct inode *inode, int mode, 
			goto out;

	}



	root = BTRFS_I(inode)->root;



	ret = btrfs_check_data_free_space(root, inode,

					  alloc_end - alloc_start);

	if (ret)

		goto out;



	locked_end = alloc_end - 1;

	while (1) {

		struct btrfs_ordered_extent *ordered;
@@ -5128,7 +5136,7 @@ static long btrfs_fallocate(struct inode *inode, int mode, 
		trans = btrfs_start_transaction(BTRFS_I(inode)->root, 1);

		if (!trans) {

			ret = -EIO;

			goto out;

			goto out_free;

		}



		/* the extent lock is ordered inside the running
@@ -5189,6 +5197,8 @@ static long btrfs_fallocate(struct inode *inode, int mode, 
		      GFP_NOFS);



	btrfs_end_transaction(trans, BTRFS_I(inode)->root);

out_free:

	btrfs_free_reserved_data_space(root, inode, alloc_end - alloc_start);

out:

	mutex_unlock(&inode->i_mutex);

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE