From b1322ba32567ff156dcea86ed6a8a6b1e1b2e5c7 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 30 Apr 2012 07:40:00 -0400
Subject: [PATCH] --- yaml --- r: 309944 b: refs/heads/master c:
 b09de7fa5217bbcb4caf3d19bd5e94816947ff7a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c67926ae1112..06adebea470d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c359a47e7d999a0ea7f397da2c15590d0a82815
+refs/heads/master: b09de7fa5217bbcb4caf3d19bd5e94816947ff7a
diff --git a/trunk/fs/ext4/namei.c b/trunk/fs/ext4/namei.c
index 5861d64929f6..a9fd5f48f3bf 100644
--- a/trunk/fs/ext4/namei.c
+++ b/trunk/fs/ext4/namei.c
@@ -1612,11 +1612,8 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
 		de = de1;
 	}
 	de->file_type = EXT4_FT_UNKNOWN;
-	if (inode) {
-		de->inode = cpu_to_le32(inode->i_ino);
-		ext4_set_de_type(dir->i_sb, de, inode->i_mode);
-	} else
-		de->inode = 0;
+	de->inode = cpu_to_le32(inode->i_ino);
+	ext4_set_de_type(dir->i_sb, de, inode->i_mode);
 	de->name_len = namelen;
 	memcpy(de->name, name, namelen);
 	/*