This is to prepare for moving the dirty expire policy to move_expired_inodes(). No behavior change. Acked-by: Jan Kara Acked-by: Mel Gorman Signed-off-by: Wu Fengguang --- fs/fs-writeback.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- linux-next.orig/fs/fs-writeback.c 2011-04-19 10:18:17.000000000 +0800 +++ linux-next/fs/fs-writeback.c 2011-04-19 10:18:28.000000000 +0800 @@ -251,8 +251,8 @@ static bool inode_dirtied_after(struct i * Move expired dirty inodes from @delaying_queue to @dispatch_queue. */ static void move_expired_inodes(struct list_head *delaying_queue, - struct list_head *dispatch_queue, - unsigned long *older_than_this) + struct list_head *dispatch_queue, + struct writeback_control *wbc) { LIST_HEAD(tmp); struct list_head *pos, *node; @@ -262,8 +262,8 @@ static void move_expired_inodes(struct l while (!list_empty(delaying_queue)) { inode = wb_inode(delaying_queue->prev); - if (older_than_this && - inode_dirtied_after(inode, *older_than_this)) + if (wbc->older_than_this && + inode_dirtied_after(inode, *wbc->older_than_this)) break; if (sb && sb != inode->i_sb) do_sb_sort = 1; @@ -299,11 +299,11 @@ static void move_expired_inodes(struct l * | * +--> dequeue for IO */ -static void queue_io(struct bdi_writeback *wb, unsigned long *older_than_this) +static void queue_io(struct bdi_writeback *wb, struct writeback_control *wbc) { assert_spin_locked(&inode_wb_list_lock); list_splice_init(&wb->b_more_io, &wb->b_io); - move_expired_inodes(&wb->b_dirty, &wb->b_io, older_than_this); + move_expired_inodes(&wb->b_dirty, &wb->b_io, wbc); } static int write_inode(struct inode *inode, struct writeback_control *wbc) @@ -579,7 +579,7 @@ void writeback_inodes_wb(struct bdi_writ wbc->wb_start = jiffies; /* livelock avoidance */ spin_lock(&inode_wb_list_lock); if (!wbc->for_kupdate || list_empty(&wb->b_io)) - queue_io(wb, wbc->older_than_this); + queue_io(wb, wbc); while (!list_empty(&wb->b_io)) { struct inode *inode = wb_inode(wb->b_io.prev); @@ -606,7 +606,7 @@ static void __writeback_inodes_sb(struct spin_lock(&inode_wb_list_lock); if (!wbc->for_kupdate || list_empty(&wb->b_io)) - queue_io(wb, wbc->older_than_this); + queue_io(wb, wbc); writeback_sb_inodes(sb, wb, wbc, true); spin_unlock(&inode_wb_list_lock); } -- 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/