From 041c01b7e57018401418bc0c54465877f1cb65ee Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 28 Jul 2011 06:11:47 +0200
Subject: [PATCH] --- yaml --- r: 262067 b: refs/heads/master c:
 b12362bdb61a230a67daa77bcd2a11e59b2802e1 h: refs/heads/master i:   262065:
 ba9fe3e23c685f9a1f033444a5a467ff3302fe7e   262063:
 54a35981b290079f7155609f18113ee7b0f3e33b v: v3

---
 [refs]           | 2 +-
 trunk/fs/inode.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3034c1ac3d77..302ca027a046 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a30d8a2b8ddd5102c440c7e5a7c8e1fd729c818
+refs/heads/master: b12362bdb61a230a67daa77bcd2a11e59b2802e1
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index d0c72ff6b30e..9dab13ae6ef7 100644
--- a/trunk/fs/inode.c
+++ b/trunk/fs/inode.c
@@ -454,7 +454,9 @@ static void evict(struct inode *inode)
 	BUG_ON(!(inode->i_state & I_FREEING));
 	BUG_ON(!list_empty(&inode->i_lru));
 
-	inode_wb_list_del(inode);
+	if (!list_empty(&inode->i_wb_list))
+		inode_wb_list_del(inode);
+
 	inode_sb_list_del(inode);
 
 	if (op->evict_inode) {