diff --git a/[refs] b/[refs]
index 96af178e0a3f..47d4117b9a5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 341c87bf346f57748230628c5ad6ee69219250e8
+refs/heads/master: 4d6c13f87db12ae1ce35ea6a15688ac72419b133
diff --git a/trunk/fs/ext2/namei.c b/trunk/fs/ext2/namei.c
index 6524ecaebb7a..e1dedb0f7873 100644
--- a/trunk/fs/ext2/namei.c
+++ b/trunk/fs/ext2/namei.c
@@ -66,8 +66,16 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
 	inode = NULL;
 	if (ino) {
 		inode = ext2_iget(dir->i_sb, ino);
-		if (IS_ERR(inode))
-			return ERR_CAST(inode);
+		if (unlikely(IS_ERR(inode))) {
+			if (PTR_ERR(inode) == -ESTALE) {
+				ext2_error(dir->i_sb, __func__,
+						"deleted inode referenced: %lu",
+						ino);
+				return ERR_PTR(-EIO);
+			} else {
+				return ERR_CAST(inode);
+			}
+		}
 	}
 	return d_splice_alias(inode, dentry);
 }