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

Commit 53d32359 authored by David Sterba's avatar David Sterba
Browse files

btrfs: embed extent_changeset::range_changed to the structure 



We can embed range_changed to the extent changeset to address following
problems:

- no need to allocate ulist dynamically, we also get rid of the GFP_NOFS
  for free
- fix lack of allocation failure checking in btrfs_qgroup_reserve_data

The stack consuption where extent_changeset is used slightly increases:

before: 16
after: 16 - 8 (for pointer) + 32 (sizeof ulist) = 40

Which is bearable.

Reviewed-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9d037933

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void add_extent_changeset(struct extent_state *state, unsigned bits, 
	if (!set && (state->state & bits) == 0)

		return;

	changeset->bytes_changed += state->end - state->start + 1;

	ret = ulist_add(changeset->range_changed, state->start, state->end,

	ret = ulist_add(&changeset->range_changed, state->start, state->end,

			GFP_ATOMIC);

	/* ENOMEM */

	BUG_ON(ret < 0);

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct extent_changeset { 
	u64 bytes_changed;



	/* Changed ranges */

	struct ulist *range_changed;

	struct ulist range_changed;

};



static inline void extent_set_compress_type(unsigned long *bio_flags,

fs/btrfs/qgroup.c

+9 −15
Original line number Diff line number Diff line
@@ -2828,7 +2828,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len) 
		return 0;



	changeset.bytes_changed = 0;

	changeset.range_changed = ulist_alloc(GFP_NOFS);

	ulist_init(&changeset.range_changed);

	ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start,

			start + len -1, EXTENT_QGROUP_RESERVED, &changeset);

	trace_btrfs_qgroup_reserve_data(inode, start, len,
@@ -2840,17 +2840,17 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len) 
	if (ret < 0)

		goto cleanup;



	ulist_free(changeset.range_changed);

	ulist_fini(&changeset.range_changed);

	return ret;



cleanup:

	/* cleanup already reserved ranges */

	ULIST_ITER_INIT(&uiter);

	while ((unode = ulist_next(changeset.range_changed, &uiter)))

	while ((unode = ulist_next(&changeset.range_changed, &uiter)))

		clear_extent_bit(&BTRFS_I(inode)->io_tree, unode->val,

				 unode->aux, EXTENT_QGROUP_RESERVED, 0, 0, NULL,

				 GFP_NOFS);

	ulist_free(changeset.range_changed);

	ulist_fini(&changeset.range_changed);

	return ret;

}
@@ -2862,10 +2862,7 @@ static int __btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len, 
	int ret;



	changeset.bytes_changed = 0;

	changeset.range_changed = ulist_alloc(GFP_NOFS);

	if (!changeset.range_changed)

		return -ENOMEM;



	ulist_init(&changeset.range_changed);

	ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, start, 

			start + len -1, EXTENT_QGROUP_RESERVED, &changeset);

	if (ret < 0)
@@ -2878,7 +2875,7 @@ static int __btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len, 
	trace_btrfs_qgroup_release_data(inode, start, len,

					changeset.bytes_changed, trace_op);

out:

	ulist_free(changeset.range_changed);

	ulist_fini(&changeset.range_changed);

	return ret;

}
@@ -2976,22 +2973,19 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode) 
	int ret;



	changeset.bytes_changed = 0;

	changeset.range_changed = ulist_alloc(GFP_NOFS);

	if (WARN_ON(!changeset.range_changed))

		return;



	ulist_init(&changeset.range_changed);

	ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, 0, (u64)-1,

			EXTENT_QGROUP_RESERVED, &changeset);



	WARN_ON(ret < 0);

	if (WARN_ON(changeset.bytes_changed)) {

		ULIST_ITER_INIT(&iter);

		while ((unode = ulist_next(changeset.range_changed, &iter))) {

		while ((unode = ulist_next(&changeset.range_changed, &iter))) {

			btrfs_warn(BTRFS_I(inode)->root->fs_info,

				"leaking qgroup reserved space, ino: %lu, start: %llu, end: %llu",

				inode->i_ino, unode->val, unode->aux);

		}

		qgroup_free(BTRFS_I(inode)->root, changeset.bytes_changed);

	}

	ulist_free(changeset.range_changed);

	ulist_fini(&changeset.range_changed);

}