diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-04 10:48:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-04 10:48:45 +1000 |
| commit | f2c26e915e695ae057b1dc5b7ae591dece07f894 (patch) | |
| tree | 36df8e81817c1f8771a035dafa10ea6e0c1df283 | |
| parent | 86b5008d7b42e04e2bfabf6910b285c57af3ffe2 (diff) | |
| parent | 519ba39dd296dbe025f81826157fc1392d3fc537 (diff) | |
Merge remote-tracking branch 'nilfs2/for-next'
| -rw-r--r-- | fs/nilfs2/inode.c | 3 | ||||
| -rw-r--r-- | 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 c0aa27490c02..2cc8c087b2d5 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -872,8 +872,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 afe4f2183454..5deeadda9083 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); } |