diff --git a/[refs] b/[refs]
index 253c12c7c8ac..2fcb279357d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a717f77362d4fe044721c126c89e2a38e731a576
+refs/heads/master: 659603ef692d3f6c7c216e80310990253864bf2e
diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c
index ffab4783ac64..c27f8d4098be 100644
--- a/trunk/fs/fs-writeback.c
+++ b/trunk/fs/fs-writeback.c
@@ -247,7 +247,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
 	wait_queue_head_t *wqh;
 
 	if (!atomic_read(&inode->i_count))
-		WARN_ON(!(inode->i_state & I_WILL_FREE));
+		WARN_ON(!(inode->i_state & (I_WILL_FREE|I_FREEING)));
 	else
 		WARN_ON(inode->i_state & I_WILL_FREE);