---

yaml --- r: 309944 b: refs/heads/master c: b09de7f h: refs/heads/master v: v3
git-mirror · Apr 30, 2012 · b1322ba · b1322ba
1 parent 94f42fc
commit b1322ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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);
 	/*