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

Commit 6655bc3d authored by David Sterba's avatar David Sterba
Browse files

btrfs: ulist: rename ulist_fini to ulist_release 



Change the name so it matches the naming we already use eg. for
btrfs_path.

Suggested-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4ae8553c

fs/btrfs/qgroup.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2834,7 +2834,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len) 
	if (ret < 0)

	if (ret < 0)

		goto cleanup;

		goto cleanup;





	ulist_fini(&changeset.range_changed);

	ulist_release(&changeset.range_changed);

	return ret;

	return ret;





cleanup:

cleanup:
@@ -2844,7 +2844,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len) 
		clear_extent_bit(&BTRFS_I(inode)->io_tree, unode->val,

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

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

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

				 GFP_NOFS);

				 GFP_NOFS);

	ulist_fini(&changeset.range_changed);

	ulist_release(&changeset.range_changed);

	return ret;

	return ret;

}

}
@@ -2871,7 +2871,7 @@ static int __btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len, 
	trace_btrfs_qgroup_release_data(inode, start, len,

	trace_btrfs_qgroup_release_data(inode, start, len,

					changeset.bytes_changed, trace_op);

					changeset.bytes_changed, trace_op);

out:

out:

	ulist_fini(&changeset.range_changed);

	ulist_release(&changeset.range_changed);

	return ret;

	return ret;

}

}
@@ -2986,5 +2986,5 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode) 
				changeset.bytes_changed);

				changeset.bytes_changed);





	}

	}

	ulist_fini(&changeset.range_changed);

	ulist_release(&changeset.range_changed);

}
 
}

fs/btrfs/ulist.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -52,13 +52,13 @@ void ulist_init(struct ulist *ulist) 
}

}





/**

/**

 * ulist_fini - free up additionally allocated memory for the ulist

 * ulist_release - free up additionally allocated memory for the ulist

 * @ulist:	the ulist from which to free the additional memory

 * @ulist:	the ulist from which to free the additional memory

 *

 *

 * This is useful in cases where the base 'struct ulist' has been statically

 * This is useful in cases where the base 'struct ulist' has been statically

 * allocated.

 * allocated.

 */

 */

void ulist_fini(struct ulist *ulist)

void ulist_release(struct ulist *ulist)

{

{

	struct ulist_node *node;

	struct ulist_node *node;

	struct ulist_node *next;

	struct ulist_node *next;
@@ -79,7 +79,7 @@ void ulist_fini(struct ulist *ulist) 
 */

 */

void ulist_reinit(struct ulist *ulist)

void ulist_reinit(struct ulist *ulist)

{

{

	ulist_fini(ulist);

	ulist_release(ulist);

	ulist_init(ulist);

	ulist_init(ulist);

}

}
@@ -105,13 +105,13 @@ struct ulist *ulist_alloc(gfp_t gfp_mask) 
 * ulist_free - free dynamically allocated ulist

 * ulist_free - free dynamically allocated ulist

 * @ulist:	ulist to free

 * @ulist:	ulist to free

 *

 *

 * It is not necessary to call ulist_fini before.

 * It is not necessary to call ulist_release before.

 */

 */

void ulist_free(struct ulist *ulist)

void ulist_free(struct ulist *ulist)

{

{

	if (!ulist)

	if (!ulist)

		return;

		return;

	ulist_fini(ulist);

	ulist_release(ulist);

	kfree(ulist);

	kfree(ulist);

}

}

fs/btrfs/ulist.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ struct ulist { 
};

};





void ulist_init(struct ulist *ulist);

void ulist_init(struct ulist *ulist);

void ulist_fini(struct ulist *ulist);

void ulist_release(struct ulist *ulist);

void ulist_reinit(struct ulist *ulist);

void ulist_reinit(struct ulist *ulist);

struct ulist *ulist_alloc(gfp_t gfp_mask);

struct ulist *ulist_alloc(gfp_t gfp_mask);

void ulist_free(struct ulist *ulist);

void ulist_free(struct ulist *ulist);