Commit d5b634ae authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: rename err to ret in convert_extent_bit() 



Unify naming of return value to the preferred way.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cbb6b5d2

fs/btrfs/extent-io-tree.c

+15 −15
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	struct extent_state *prealloc = NULL;

	struct rb_node **p = NULL;

	struct rb_node *parent = NULL;

	int err = 0;

	int ret = 0;

	u64 last_start;

	u64 last_end;

	bool first_iteration = true;
@@ -1351,7 +1351,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	if (!state) {

		prealloc = alloc_extent_state_atomic(prealloc);

		if (!prealloc) {

			err = -ENOMEM;

			ret = -ENOMEM;

			goto out;

		}

		prealloc->start = start;
@@ -1402,14 +1402,14 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	if (state->start < start) {

		prealloc = alloc_extent_state_atomic(prealloc);

		if (!prealloc) {

			err = -ENOMEM;

			ret = -ENOMEM;

			goto out;

		}

		err = split_state(tree, state, prealloc, start);

		if (err)

			extent_io_tree_panic(tree, state, "split", err);

		ret = split_state(tree, state, prealloc, start);

		if (ret)

			extent_io_tree_panic(tree, state, "split", ret);

		prealloc = NULL;

		if (err)

		if (ret)

			goto out;

		if (state->end <= end) {

			set_state_bits(tree, state, bits, NULL);
@@ -1442,7 +1442,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 


		prealloc = alloc_extent_state_atomic(prealloc);

		if (!prealloc) {

			err = -ENOMEM;

			ret = -ENOMEM;

			goto out;

		}
@@ -1454,8 +1454,8 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
		prealloc->end = this_end;

		inserted_state = insert_state(tree, prealloc, bits, NULL);

		if (IS_ERR(inserted_state)) {

			err = PTR_ERR(inserted_state);

			extent_io_tree_panic(tree, prealloc, "insert", err);

			ret = PTR_ERR(inserted_state);

			extent_io_tree_panic(tree, prealloc, "insert", ret);

		}

		cache_state(inserted_state, cached_state);

		if (inserted_state == prealloc)
@@ -1472,13 +1472,13 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	if (state->start <= end && state->end > end) {

		prealloc = alloc_extent_state_atomic(prealloc);

		if (!prealloc) {

			err = -ENOMEM;

			ret = -ENOMEM;

			goto out;

		}



		err = split_state(tree, state, prealloc, end + 1);

		if (err)

			extent_io_tree_panic(tree, state, "split", err);

		ret = split_state(tree, state, prealloc, end + 1);

		if (ret)

			extent_io_tree_panic(tree, state, "split", ret);



		set_state_bits(tree, prealloc, bits, NULL);

		cache_state(prealloc, cached_state);
@@ -1500,7 +1500,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 
	if (prealloc)

		free_extent_state(prealloc);



	return err;

	return ret;

}



/*