diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-01-14 16:21:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 21:27:10 -0500 |
commit | 082a05c6f02e00982dd42ddae434fbc806a822e5 (patch) | |
tree | a26e7df9e311c2dce2fb739502656baeeb683d62 /fs | |
parent | 505970b96e3b7d22177c38e03435a68376628e7a (diff) |
[PATCH] ext2: remove d_splice_alias NULL check from ext2_lookup
Remove redundant NULL check in ext2_lookup() as d_splice_alias() can take NULL
inode as input.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext2/namei.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index c5513953c825..ad1432a2a62e 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c | |||
@@ -83,10 +83,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str | |||
83 | if (!inode) | 83 | if (!inode) |
84 | return ERR_PTR(-EACCES); | 84 | return ERR_PTR(-EACCES); |
85 | } | 85 | } |
86 | if (inode) | 86 | return d_splice_alias(inode, dentry); |
87 | return d_splice_alias(inode, dentry); | ||
88 | d_add(dentry, inode); | ||
89 | return NULL; | ||
90 | } | 87 | } |
91 | 88 | ||
92 | struct dentry *ext2_get_parent(struct dentry *child) | 89 | struct dentry *ext2_get_parent(struct dentry *child) |