Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Btrfs: kill max_extent mount option 



As Yan pointed out, theres not much reason for all this complicated math to
account for file extents being split up into max_extent chunks, since they are
likely to all end up in the same leaf anyway.  Since there isn't much reason to
use max_extent, just remove the option altogether so we have one less thing we
need to test.

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

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -834,7 +834,6 @@ struct btrfs_fs_info { 
	u64 last_trans_log_full_commit;

	u64 open_ioctl_trans;

	unsigned long mount_opt;

	u64 max_extent;

	u64 max_inline;

	u64 alloc_start;

	struct btrfs_transaction *running_transaction;

fs/btrfs/disk-io.c

+0 −1
Original line number Diff line number Diff line
@@ -1634,7 +1634,6 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	atomic_set(&fs_info->async_submit_draining, 0);

	atomic_set(&fs_info->nr_async_bios, 0);

	fs_info->sb = sb;

	fs_info->max_extent = (u64)-1;

	fs_info->max_inline = 8192 * 1024;

	fs_info->metadata_ratio = 0;

fs/btrfs/extent-tree.c

+2 −2
Original line number Diff line number Diff line
@@ -2846,7 +2846,7 @@ int btrfs_unreserve_metadata_for_delalloc(struct btrfs_root *root, 
	}

	spin_unlock(&BTRFS_I(inode)->accounting_lock);



	BTRFS_I(inode)->reserved_extents--;

	BTRFS_I(inode)->reserved_extents -= num_items;

	BUG_ON(BTRFS_I(inode)->reserved_extents < 0);



	if (meta_sinfo->bytes_delalloc < num_bytes) {
@@ -3111,7 +3111,7 @@ again: 
		return -ENOSPC;

	}



	BTRFS_I(inode)->reserved_extents++;

	BTRFS_I(inode)->reserved_extents += num_items;

	check_force_delalloc(meta_sinfo);

	spin_unlock(&meta_sinfo->lock);

fs/btrfs/inode.c

+4 −55
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static noinline int cow_file_range(struct inode *inode, 
	while (disk_num_bytes > 0) {

		unsigned long op;



		cur_alloc_size = min(disk_num_bytes, root->fs_info->max_extent);

		cur_alloc_size = disk_num_bytes;

		ret = btrfs_reserve_extent(trans, root, cur_alloc_size,

					   root->sectorsize, 0, alloc_hint,

					   (u64)-1, &ins, 1);
@@ -1227,30 +1227,9 @@ static int run_delalloc_range(struct inode *inode, struct page *locked_page, 
static int btrfs_split_extent_hook(struct inode *inode,

				    struct extent_state *orig, u64 split)

{

	struct btrfs_root *root = BTRFS_I(inode)->root;

	u64 size;



	if (!(orig->state & EXTENT_DELALLOC))

		return 0;



	size = orig->end - orig->start + 1;

	if (size > root->fs_info->max_extent) {

		u64 num_extents;

		u64 new_size;



		new_size = orig->end - split + 1;

		num_extents = div64_u64(size + root->fs_info->max_extent - 1,

					root->fs_info->max_extent);



		/*

		 * if we break a large extent up then leave oustanding_extents

		 * be, since we've already accounted for the large extent.

		 */

		if (div64_u64(new_size + root->fs_info->max_extent - 1,

			      root->fs_info->max_extent) < num_extents)

			return 0;

	}



	spin_lock(&BTRFS_I(inode)->accounting_lock);

	BTRFS_I(inode)->outstanding_extents++;

	spin_unlock(&BTRFS_I(inode)->accounting_lock);
@@ -1268,38 +1247,10 @@ static int btrfs_merge_extent_hook(struct inode *inode, 
				   struct extent_state *new,

				   struct extent_state *other)

{

	struct btrfs_root *root = BTRFS_I(inode)->root;

	u64 new_size, old_size;

	u64 num_extents;



	/* not delalloc, ignore it */

	if (!(other->state & EXTENT_DELALLOC))

		return 0;



	old_size = other->end - other->start + 1;

	if (new->start < other->start)

		new_size = other->end - new->start + 1;

	else

		new_size = new->end - other->start + 1;



	/* we're not bigger than the max, unreserve the space and go */

	if (new_size <= root->fs_info->max_extent) {

		spin_lock(&BTRFS_I(inode)->accounting_lock);

		BTRFS_I(inode)->outstanding_extents--;

		spin_unlock(&BTRFS_I(inode)->accounting_lock);

		return 0;

	}



	/*

	 * If we grew by another max_extent, just return, we want to keep that

	 * reserved amount.

	 */

	num_extents = div64_u64(old_size + root->fs_info->max_extent - 1,

				root->fs_info->max_extent);

	if (div64_u64(new_size + root->fs_info->max_extent - 1,

		      root->fs_info->max_extent) > num_extents)

		return 0;



	spin_lock(&BTRFS_I(inode)->accounting_lock);

	BTRFS_I(inode)->outstanding_extents--;

	spin_unlock(&BTRFS_I(inode)->accounting_lock);
@@ -1328,6 +1279,7 @@ static int btrfs_set_bit_hook(struct inode *inode, u64 start, u64 end, 
		BTRFS_I(inode)->outstanding_extents++;

		spin_unlock(&BTRFS_I(inode)->accounting_lock);

		btrfs_delalloc_reserve_space(root, inode, end - start + 1);



		spin_lock(&root->fs_info->delalloc_lock);

		BTRFS_I(inode)->delalloc_bytes += end - start + 1;

		root->fs_info->delalloc_bytes += end - start + 1;
@@ -1356,6 +1308,7 @@ static int btrfs_clear_bit_hook(struct inode *inode, 


		if (bits & EXTENT_DO_ACCOUNTING) {

			spin_lock(&BTRFS_I(inode)->accounting_lock);

			WARN_ON(!BTRFS_I(inode)->outstanding_extents);

			BTRFS_I(inode)->outstanding_extents--;

			spin_unlock(&BTRFS_I(inode)->accounting_lock);

			btrfs_unreserve_metadata_for_delalloc(root, inode, 1);
@@ -5384,7 +5337,6 @@ free: 
void btrfs_drop_inode(struct inode *inode)

{

	struct btrfs_root *root = BTRFS_I(inode)->root;



	if (inode->i_nlink > 0 && btrfs_root_refs(&root->root_item) == 0)

		generic_delete_inode(inode);

	else
@@ -5788,18 +5740,15 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end, 
	struct btrfs_trans_handle *trans;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_key ins;

	u64 alloc_size;

	u64 cur_offset = start;

	u64 num_bytes = end - start;

	int ret = 0;

	u64 i_size;



	while (num_bytes > 0) {

		alloc_size = min(num_bytes, root->fs_info->max_extent);



		trans = btrfs_start_transaction(root, 1);



		ret = btrfs_reserve_extent(trans, root, alloc_size,

		ret = btrfs_reserve_extent(trans, root, num_bytes,

					   root->sectorsize, 0, alloc_hint,

					   (u64)-1, &ins, 1);

		if (ret) {

fs/btrfs/ordered-data.c

+4 −2
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ static int __btrfs_remove_ordered_extent(struct inode *inode, 
				struct btrfs_ordered_extent *entry)

{

	struct btrfs_ordered_inode_tree *tree;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct rb_node *node;



	tree = &BTRFS_I(inode)->ordered_tree;
@@ -312,12 +313,13 @@ static int __btrfs_remove_ordered_extent(struct inode *inode, 
	set_bit(BTRFS_ORDERED_COMPLETE, &entry->flags);



	spin_lock(&BTRFS_I(inode)->accounting_lock);

	WARN_ON(!BTRFS_I(inode)->outstanding_extents);

	BTRFS_I(inode)->outstanding_extents--;

	spin_unlock(&BTRFS_I(inode)->accounting_lock);

	btrfs_unreserve_metadata_for_delalloc(BTRFS_I(inode)->root,

					      inode, 1);



	spin_lock(&BTRFS_I(inode)->root->fs_info->ordered_extent_lock);

	spin_lock(&root->fs_info->ordered_extent_lock);

	list_del_init(&entry->root_extent_list);



	/*
@@ -329,7 +331,7 @@ static int __btrfs_remove_ordered_extent(struct inode *inode, 
	    !mapping_tagged(inode->i_mapping, PAGECACHE_TAG_DIRTY)) {

		list_del_init(&BTRFS_I(inode)->ordered_operations);

	}

	spin_unlock(&BTRFS_I(inode)->root->fs_info->ordered_extent_lock);

	spin_unlock(&root->fs_info->ordered_extent_lock);



	return 0;

}