From d4a8a7bcc757e3cb1238cd97ee72198790262d22 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 28 Jul 2011 06:55:13 +0200
Subject: [PATCH] --- yaml --- r: 262069 b: refs/heads/master c:
 c4ae0c65455c1bb30d1b71c6dd9a1a62aadde8ef h: refs/heads/master i:   262067:
 041c01b7e57018401418bc0c54465877f1cb65ee v: v3

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

diff --git a/[refs] b/[refs]
index fee4ef35fe21..7aa2a75f93e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2ee7abf4c40c8e6bffced923a7c01ea2d1f6c97
+refs/heads/master: c4ae0c65455c1bb30d1b71c6dd9a1a62aadde8ef
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index e445be2a18f9..5aab80dc008c 100644
--- a/trunk/fs/inode.c
+++ b/trunk/fs/inode.c
@@ -1330,7 +1330,8 @@ static void iput_final(struct inode *inode)
 	}
 
 	inode->i_state |= I_FREEING;
-	inode_lru_list_del(inode);
+	if (!list_empty(&inode->i_lru))
+		inode_lru_list_del(inode);
 	spin_unlock(&inode->i_lock);
 
 	evict(inode);