From 8a3b0f83f4c998970981bda8ab5cfc485260084c Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 24 Oct 2010 19:40:46 +0200 Subject: [PATCH] --- yaml --- r: 217821 b: refs/heads/master c: 9843b76aae80293f5b5a0e275360627508595ce5 h: refs/heads/master i: 217819: 921d110ca96d24a1c76cb70bd1387cd59b7e9c39 v: v3 --- [refs] | 2 +- trunk/fs/fs-writeback.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 37e37e3ce9e0..39b53d9e2a72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a031878670ac8fe466859d4c1506bd91ae48678c +refs/heads/master: 9843b76aae80293f5b5a0e275360627508595ce5 diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c index 7a24cc957f05..f6af81add459 100644 --- a/trunk/fs/fs-writeback.c +++ b/trunk/fs/fs-writeback.c @@ -487,10 +487,16 @@ static int writeback_sb_inodes(struct super_block *sb, struct bdi_writeback *wb, return 0; } - if (inode->i_state & (I_NEW | I_WILL_FREE)) { + /* + * Don't bother with new inodes or inodes beeing freed, first + * kind does not need peridic writeout yet, and for the latter + * kind writeout is handled by the freer. + */ + if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE)) { requeue_io(inode); continue; } + /* * Was this inode dirtied after sync_sb_inodes was called? * This keeps sync from extra jobs and livelock. @@ -498,7 +504,6 @@ static int writeback_sb_inodes(struct super_block *sb, struct bdi_writeback *wb, if (inode_dirtied_after(inode, wbc->wb_start)) return 1; - BUG_ON(inode->i_state & I_FREEING); __iget(inode); pages_skipped = wbc->pages_skipped; writeback_single_inode(inode, wbc);