aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-10-17 02:30:37 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:02 -0400
commit670e4def6ef5f44315d62748134e535b479c784f (patch)
tree808b850c2f08c3d546f6ca06850815324cb770a3 /fs
parent65cb9b47e0ea568a7a38cce7773052a6ea093629 (diff)
writeback: fix time ordering of the per superblock dirty inode lists 7
This one fixes four bugs. There are a few situation in there where writeback decides it is going to skip over a blockdev inode on the kernel-internal blockdev superblock. It presently does this by moving the blockdev inode onto the tail of the blockdev superblock's s_dirty. But a) this screws up s_dirty's reverse-time-orderedness and b) refiling the blockdev for writeback in another 30 second is rude. We should try again sooner than that. Fix all this up by using redirty_head(): move the blockdev inode onto the head of the blockdev superblock's s_dirty list for prompt writeback. Cc: Mike Waychison <mikew@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/fs-writeback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 30d9383c87c3..39fadfad86f7 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -410,14 +410,14 @@ sync_sb_inodes(struct super_block *sb, struct writeback_control *wbc)
410 wbc->encountered_congestion = 1; 410 wbc->encountered_congestion = 1;
411 if (!sb_is_blkdev_sb(sb)) 411 if (!sb_is_blkdev_sb(sb))
412 break; /* Skip a congested fs */ 412 break; /* Skip a congested fs */
413 list_move(&inode->i_list, &sb->s_dirty); 413 redirty_head(inode);
414 continue; /* Skip a congested blockdev */ 414 continue; /* Skip a congested blockdev */
415 } 415 }
416 416
417 if (wbc->bdi && bdi != wbc->bdi) { 417 if (wbc->bdi && bdi != wbc->bdi) {
418 if (!sb_is_blkdev_sb(sb)) 418 if (!sb_is_blkdev_sb(sb))
419 break; /* fs has the wrong queue */ 419 break; /* fs has the wrong queue */
420 list_move(&inode->i_list, &sb->s_dirty); 420 redirty_head(inode);
421 continue; /* blockdev has wrong queue */ 421 continue; /* blockdev has wrong queue */
422 } 422 }
423 423