Commit 0f6bc579 authored by Ruan Jinjie's avatar Ruan Jinjie Committed by Theodore Ts'o
Browse files

ext4: use LIST_HEAD() to initialize the list_head in mballoc.c 



Use LIST_HEAD() to initialize the list_head instead of open-coding it.

Signed-off-by: default avatarRuan Jinjie <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230812071839.3481909-1-ruanjinjie@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 03de20be

fs/ext4/mballoc.c

+5 −13
Original line number Diff line number Diff line
@@ -3504,11 +3504,10 @@ static void ext4_discard_work(struct work_struct *work) 
	struct super_block *sb = sbi->s_sb;

	struct ext4_free_data *fd, *nfd;

	struct ext4_buddy e4b;

	struct list_head discard_list;

	LIST_HEAD(discard_list);

	ext4_group_t grp, load_grp;

	int err = 0;



	INIT_LIST_HEAD(&discard_list);

	spin_lock(&sbi->s_md_lock);

	list_splice_init(&sbi->s_discard_list, &discard_list);

	spin_unlock(&sbi->s_md_lock);
@@ -3882,12 +3881,10 @@ void ext4_process_freed_data(struct super_block *sb, tid_t commit_tid) 
{

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_free_data *entry, *tmp;

	struct list_head freed_data_list;

	LIST_HEAD(freed_data_list);

	struct list_head *cut_pos = NULL;

	bool wake;



	INIT_LIST_HEAD(&freed_data_list);



	spin_lock(&sbi->s_md_lock);

	list_for_each_entry(entry, &sbi->s_freed_data_list, efd_list) {

		if (entry->efd_tid != commit_tid)
@@ -5414,7 +5411,7 @@ ext4_mb_discard_group_preallocations(struct super_block *sb, 
	struct ext4_group_info *grp = ext4_get_group_info(sb, group);

	struct buffer_head *bitmap_bh = NULL;

	struct ext4_prealloc_space *pa, *tmp;

	struct list_head list;

	LIST_HEAD(list);

	struct ext4_buddy e4b;

	struct ext4_inode_info *ei;

	int err;
@@ -5443,7 +5440,6 @@ ext4_mb_discard_group_preallocations(struct super_block *sb, 
		goto out_dbg;

	}



	INIT_LIST_HEAD(&list);

	ext4_lock_group(sb, group);

	list_for_each_entry_safe(pa, tmp,

				&grp->bb_prealloc_list, pa_group_list) {
@@ -5524,7 +5520,7 @@ void ext4_discard_preallocations(struct inode *inode, unsigned int needed) 
	struct buffer_head *bitmap_bh = NULL;

	struct ext4_prealloc_space *pa, *tmp;

	ext4_group_t group = 0;

	struct list_head list;

	LIST_HEAD(list);

	struct ext4_buddy e4b;

	struct rb_node *iter;

	int err;
@@ -5541,8 +5537,6 @@ void ext4_discard_preallocations(struct inode *inode, unsigned int needed) 
	trace_ext4_discard_preallocations(inode,

			atomic_read(&ei->i_prealloc_active), needed);



	INIT_LIST_HEAD(&list);



	if (needed == 0)

		needed = UINT_MAX;
@@ -5858,13 +5852,11 @@ ext4_mb_discard_lg_preallocations(struct super_block *sb, 
{

	ext4_group_t group = 0;

	struct ext4_buddy e4b;

	struct list_head discard_list;

	LIST_HEAD(discard_list);

	struct ext4_prealloc_space *pa, *tmp;



	mb_debug(sb, "discard locality group preallocation\n");



	INIT_LIST_HEAD(&discard_list);



	spin_lock(&lg->lg_prealloc_lock);

	list_for_each_entry_rcu(pa, &lg->lg_prealloc_list[order],

				pa_node.lg_list,