Introduce queue_dirty() to enqueue a newly dirtied inode. It helps remove duplicate code. Cc: Michael Rubin Cc: Peter Zijlstra Signed-off-by: Fengguang Wu --- fs/fs-writeback.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) --- linux-2.6.24-rc6-mm1.orig/fs/fs-writeback.c +++ linux-2.6.24-rc6-mm1/fs/fs-writeback.c @@ -23,10 +23,19 @@ #include #include #include #include "internal.h" +/* + * Enqueue a newly dirtied inode. + */ +static void queue_dirty(struct inode *inode) +{ + inode->dirtied_when = jiffies; + list_move(&inode->i_list, &inode->i_sb->s_dirty); +} + /** * __mark_inode_dirty - internal function * @inode: inode to mark * @flags: what kind of dirty (i.e. I_DIRTY_SYNC) * Mark an inode as dirty. Callers should use mark_inode_dirty or @@ -120,14 +129,12 @@ void __mark_inode_dirty(struct inode *in /* * If the inode was already on s_dirty/s_io/s_more_io, don't * reposition it (that would break s_dirty time-ordering). */ - if (!was_dirty) { - inode->dirtied_when = jiffies; - list_move(&inode->i_list, &sb->s_dirty); - } + if (!was_dirty) + queue_dirty(inode); } out: spin_unlock(&inode_lock); } @@ -438,14 +445,12 @@ int generic_sync_sb_inodes(struct super_ __iget(inode); pages_skipped = wbc->pages_skipped; err = __writeback_single_inode(inode, wbc); if (!ret) ret = err; - if (wbc->sync_mode == WB_SYNC_HOLD) { - inode->dirtied_when = jiffies; - list_move(&inode->i_list, &sb->s_dirty); - } + if (wbc->sync_mode == WB_SYNC_HOLD) + queue_dirty(inode); if (current_is_pdflush()) writeback_release(bdi); if (wbc->pages_skipped != pages_skipped) { /* * writeback is not making progress due to locked -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/