aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-04-30 07:40:00 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-04-30 07:40:00 -0400
commitb09de7fa5217bbcb4caf3d19bd5e94816947ff7a (patch)
treee4ca909438eb43ac5b493793891d626ffd0e6b06
parent5c359a47e7d999a0ea7f397da2c15590d0a82815 (diff)
ext4: remove unnecessary check in add_dirent_to_buf()
None of this function callers ever pass in a NULL inode pointer, so this check is unnecessary, and the else clause is dead code. (This change should make the code coverage people a little happier. :-) Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/namei.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5861d64929f6..a9fd5f48f3bf 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1612,11 +1612,8 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
1612 de = de1; 1612 de = de1;
1613 } 1613 }
1614 de->file_type = EXT4_FT_UNKNOWN; 1614 de->file_type = EXT4_FT_UNKNOWN;
1615 if (inode) { 1615 de->inode = cpu_to_le32(inode->i_ino);
1616 de->inode = cpu_to_le32(inode->i_ino); 1616 ext4_set_de_type(dir->i_sb, de, inode->i_mode);
1617 ext4_set_de_type(dir->i_sb, de, inode->i_mode);
1618 } else
1619 de->inode = 0;
1620 de->name_len = namelen; 1617 de->name_len = namelen;
1621 memcpy(de->name, name, namelen); 1618 memcpy(de->name, name, namelen);
1622 /* 1619 /*