2011-03-19 15:51:14

by Nicolas Kaiser

Subject: [PATCH] nilfs2: merge list_del()/list_add_tail() to list_move_tail()

Merge list_del() + list_add_tail() to list_move_tail().

Signed-off-by: Nicolas Kaiser <[email protected]>
---
fs/nilfs2/inode.c | 3 +--
fs/nilfs2/segment.c | 6 ++----
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index d5625be..84f1b76 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -873,8 +873,7 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty)
return -EINVAL; /* NILFS_I_DIRTY may remain for
freeing inode */
}
- list_del(&ii->i_dirty);
- list_add_tail(&ii->i_dirty, &nilfs->ns_dirty_files);
+ list_move_tail(&ii->i_dirty, &nilfs->ns_dirty_files);
set_bit(NILFS_I_QUEUED, &ii->i_state);
}
spin_unlock(&nilfs->ns_inode_lock);
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index afe4f21..5deeadd 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -1991,8 +1991,7 @@ static int nilfs_segctor_collect_dirty_files(struct nilfs_sc_info *sci,

clear_bit(NILFS_I_QUEUED, &ii->i_state);
set_bit(NILFS_I_BUSY, &ii->i_state);
- list_del(&ii->i_dirty);
- list_add_tail(&ii->i_dirty, &sci->sc_dirty_files);
+ list_move_tail(&ii->i_dirty, &sci->sc_dirty_files);
}
spin_unlock(&nilfs->ns_inode_lock);

@@ -2014,8 +2013,7 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci,
clear_bit(NILFS_I_BUSY, &ii->i_state);
brelse(ii->i_bh);
ii->i_bh = NULL;
- list_del(&ii->i_dirty);
- list_add_tail(&ii->i_dirty, &ti->ti_garbage);
+ list_move_tail(&ii->i_dirty, &ti->ti_garbage);
}
spin_unlock(&nilfs->ns_inode_lock);
}
--
1.7.3.4

2011-03-20 15:34:22

by Ryusuke Konishi

Subject: Re: [PATCH] nilfs2: merge list_del()/list_add_tail() to list_move_tail()

On Sat, 19 Mar 2011 16:45:30 +0100, Nicolas Kaiser wrote:
> Merge list_del() + list_add_tail() to list_move_tail().
>
> Signed-off-by: Nicolas Kaiser <[email protected]>
> ---
> fs/nilfs2/inode.c | 3 +--
> fs/nilfs2/segment.c | 6 ++----
> 2 files changed, 3 insertions(+), 6 deletions(-)

Thanks, applied both patches.

Ryusuke Konishi

> diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
> index d5625be..84f1b76 100644
> --- a/fs/nilfs2/inode.c
> +++ b/fs/nilfs2/inode.c
> @@ -873,8 +873,7 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned nr_dirty)
> return -EINVAL; /* NILFS_I_DIRTY may remain for
> freeing inode */
> }
> - list_del(&ii->i_dirty);
> - list_add_tail(&ii->i_dirty, &nilfs->ns_dirty_files);
> + list_move_tail(&ii->i_dirty, &nilfs->ns_dirty_files);
> set_bit(NILFS_I_QUEUED, &ii->i_state);
> }
> spin_unlock(&nilfs->ns_inode_lock);
> diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
> index afe4f21..5deeadd 100644
> --- a/fs/nilfs2/segment.c
> +++ b/fs/nilfs2/segment.c
> @@ -1991,8 +1991,7 @@ static int nilfs_segctor_collect_dirty_files(struct nilfs_sc_info *sci,
>
> clear_bit(NILFS_I_QUEUED, &ii->i_state);
> set_bit(NILFS_I_BUSY, &ii->i_state);
> - list_del(&ii->i_dirty);
> - list_add_tail(&ii->i_dirty, &sci->sc_dirty_files);
> + list_move_tail(&ii->i_dirty, &sci->sc_dirty_files);
> }
> spin_unlock(&nilfs->ns_inode_lock);
>
> @@ -2014,8 +2013,7 @@ static void nilfs_segctor_drop_written_files(struct nilfs_sc_info *sci,
> clear_bit(NILFS_I_BUSY, &ii->i_state);
> brelse(ii->i_bh);
> ii->i_bh = NULL;
> - list_del(&ii->i_dirty);
> - list_add_tail(&ii->i_dirty, &ti->ti_garbage);
> + list_move_tail(&ii->i_dirty, &ti->ti_garbage);
> }
> spin_unlock(&nilfs->ns_inode_lock);
> }
> --
> 1.7.3.4
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/