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

Commit eaae0f37 authored by Nicolas Kaiser's avatar Nicolas Kaiser Committed by Ryusuke Konishi
Browse files

nilfs2: merge list_del()/list_add_tail() to list_move_tail() 



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

Signed-off-by: default avatarNicolas Kaiser <nikai@nikai.net>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 349dbc36

fs/nilfs2/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

fs/nilfs2/segment.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

}