---

yaml --- r: 217821 b: refs/heads/master c: 9843b76 h: refs/heads/master i: 217819: 921d110 v: v3
git-mirror · Oct 26, 2010 · 8a3b0f8 · 8a3b0f8
1 parent b8b173d
commit 8a3b0f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -487,18 +487,23 @@ 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.
 		 */
 		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);