提交 96e7c02d 编写于 作者: D Daejun Park 提交者: Theodore Ts'o

ext4: Change list_for_each* to list_for_each_entry*

In the fast_commit.c, list_for_each* + list_entry can be changed to
list_for_each_entry*. It reduces number of variables and lines.
Signed-off-by: NDaejun Park <daejun7.park@samsung.com>
Link: https://lore.kernel.org/r/20210111013726epcms2p4579ae56040d7043db785bf0d0a785dc7@epcms2p4Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
上级 027f14f5
...@@ -915,13 +915,11 @@ static int ext4_fc_submit_inode_data_all(journal_t *journal) ...@@ -915,13 +915,11 @@ static int ext4_fc_submit_inode_data_all(journal_t *journal)
struct super_block *sb = (struct super_block *)(journal->j_private); struct super_block *sb = (struct super_block *)(journal->j_private);
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_inode_info *ei; struct ext4_inode_info *ei;
struct list_head *pos;
int ret = 0; int ret = 0;
spin_lock(&sbi->s_fc_lock); spin_lock(&sbi->s_fc_lock);
ext4_set_mount_flag(sb, EXT4_MF_FC_COMMITTING); ext4_set_mount_flag(sb, EXT4_MF_FC_COMMITTING);
list_for_each(pos, &sbi->s_fc_q[FC_Q_MAIN]) { list_for_each_entry(ei, &sbi->s_fc_q[FC_Q_MAIN], i_fc_list) {
ei = list_entry(pos, struct ext4_inode_info, i_fc_list);
ext4_set_inode_state(&ei->vfs_inode, EXT4_STATE_FC_COMMITTING); ext4_set_inode_state(&ei->vfs_inode, EXT4_STATE_FC_COMMITTING);
while (atomic_read(&ei->i_fc_updates)) { while (atomic_read(&ei->i_fc_updates)) {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
...@@ -978,17 +976,15 @@ __releases(&sbi->s_fc_lock) ...@@ -978,17 +976,15 @@ __releases(&sbi->s_fc_lock)
{ {
struct super_block *sb = (struct super_block *)(journal->j_private); struct super_block *sb = (struct super_block *)(journal->j_private);
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_fc_dentry_update *fc_dentry; struct ext4_fc_dentry_update *fc_dentry, *fc_dentry_n;
struct inode *inode; struct inode *inode;
struct list_head *pos, *n, *fcd_pos, *fcd_n; struct ext4_inode_info *ei, *ei_n;
struct ext4_inode_info *ei;
int ret; int ret;
if (list_empty(&sbi->s_fc_dentry_q[FC_Q_MAIN])) if (list_empty(&sbi->s_fc_dentry_q[FC_Q_MAIN]))
return 0; return 0;
list_for_each_safe(fcd_pos, fcd_n, &sbi->s_fc_dentry_q[FC_Q_MAIN]) { list_for_each_entry_safe(fc_dentry, fc_dentry_n,
fc_dentry = list_entry(fcd_pos, struct ext4_fc_dentry_update, &sbi->s_fc_dentry_q[FC_Q_MAIN], fcd_list) {
fcd_list);
if (fc_dentry->fcd_op != EXT4_FC_TAG_CREAT) { if (fc_dentry->fcd_op != EXT4_FC_TAG_CREAT) {
spin_unlock(&sbi->s_fc_lock); spin_unlock(&sbi->s_fc_lock);
if (!ext4_fc_add_dentry_tlv( if (!ext4_fc_add_dentry_tlv(
...@@ -1004,8 +1000,8 @@ __releases(&sbi->s_fc_lock) ...@@ -1004,8 +1000,8 @@ __releases(&sbi->s_fc_lock)
} }
inode = NULL; inode = NULL;
list_for_each_safe(pos, n, &sbi->s_fc_q[FC_Q_MAIN]) { list_for_each_entry_safe(ei, ei_n, &sbi->s_fc_q[FC_Q_MAIN],
ei = list_entry(pos, struct ext4_inode_info, i_fc_list); i_fc_list) {
if (ei->vfs_inode.i_ino == fc_dentry->fcd_ino) { if (ei->vfs_inode.i_ino == fc_dentry->fcd_ino) {
inode = &ei->vfs_inode; inode = &ei->vfs_inode;
break; break;
...@@ -1057,7 +1053,6 @@ static int ext4_fc_perform_commit(journal_t *journal) ...@@ -1057,7 +1053,6 @@ static int ext4_fc_perform_commit(journal_t *journal)
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_inode_info *iter; struct ext4_inode_info *iter;
struct ext4_fc_head head; struct ext4_fc_head head;
struct list_head *pos;
struct inode *inode; struct inode *inode;
struct blk_plug plug; struct blk_plug plug;
int ret = 0; int ret = 0;
...@@ -1099,8 +1094,7 @@ static int ext4_fc_perform_commit(journal_t *journal) ...@@ -1099,8 +1094,7 @@ static int ext4_fc_perform_commit(journal_t *journal)
goto out; goto out;
} }
list_for_each(pos, &sbi->s_fc_q[FC_Q_MAIN]) { list_for_each_entry(iter, &sbi->s_fc_q[FC_Q_MAIN], i_fc_list) {
iter = list_entry(pos, struct ext4_inode_info, i_fc_list);
inode = &iter->vfs_inode; inode = &iter->vfs_inode;
if (!ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING)) if (!ext4_test_inode_state(inode, EXT4_STATE_FC_COMMITTING))
continue; continue;
...@@ -1226,9 +1220,8 @@ static void ext4_fc_cleanup(journal_t *journal, int full) ...@@ -1226,9 +1220,8 @@ static void ext4_fc_cleanup(journal_t *journal, int full)
{ {
struct super_block *sb = journal->j_private; struct super_block *sb = journal->j_private;
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_inode_info *iter; struct ext4_inode_info *iter, *iter_n;
struct ext4_fc_dentry_update *fc_dentry; struct ext4_fc_dentry_update *fc_dentry;
struct list_head *pos, *n;
if (full && sbi->s_fc_bh) if (full && sbi->s_fc_bh)
sbi->s_fc_bh = NULL; sbi->s_fc_bh = NULL;
...@@ -1236,8 +1229,8 @@ static void ext4_fc_cleanup(journal_t *journal, int full) ...@@ -1236,8 +1229,8 @@ static void ext4_fc_cleanup(journal_t *journal, int full)
jbd2_fc_release_bufs(journal); jbd2_fc_release_bufs(journal);
spin_lock(&sbi->s_fc_lock); spin_lock(&sbi->s_fc_lock);
list_for_each_safe(pos, n, &sbi->s_fc_q[FC_Q_MAIN]) { list_for_each_entry_safe(iter, iter_n, &sbi->s_fc_q[FC_Q_MAIN],
iter = list_entry(pos, struct ext4_inode_info, i_fc_list); i_fc_list) {
list_del_init(&iter->i_fc_list); list_del_init(&iter->i_fc_list);
ext4_clear_inode_state(&iter->vfs_inode, ext4_clear_inode_state(&iter->vfs_inode,
EXT4_STATE_FC_COMMITTING); EXT4_STATE_FC_COMMITTING);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册