diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-01-14 22:21:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 03:27:10 +0100 |
| commit | 082a05c6f02e00982dd42ddae434fbc806a822e5 (patch) | |
| tree | a26e7df9e311c2dce2fb739502656baeeb683d62 | |
| parent | [PATCH] cpuset oom lock fix (diff) | |
| download | linux-082a05c6f02e00982dd42ddae434fbc806a822e5.tar.xz linux-082a05c6f02e00982dd42ddae434fbc806a822e5.zip | |
[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>
| -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 if (!inode) return ERR_PTR(-EACCES); } - if (inode) - return d_splice_alias(inode, dentry); - d_add(dentry, inode); - return NULL; + return d_splice_alias(inode, dentry); } struct dentry *ext2_get_parent(struct dentry *child) |