diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2006-01-14 16:21:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 21:27:10 -0500 |
commit | ba7fe369875075c3b0def9887afb7a44fa88175e (patch) | |
tree | 2b1052b698a66b67e981fbdea526c4b09df65ede | |
parent | 082a05c6f02e00982dd42ddae434fbc806a822e5 (diff) |
[PATCH] ext3: remove d_splice_alias NULL check from ext3_lookup
Remove redundant NULL check in ext3_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/ext3/namei.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index af193a304ee5..8bd8ac077704 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -1005,10 +1005,7 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str | |||
1005 | if (!inode) | 1005 | if (!inode) |
1006 | return ERR_PTR(-EACCES); | 1006 | return ERR_PTR(-EACCES); |
1007 | } | 1007 | } |
1008 | if (inode) | 1008 | return d_splice_alias(inode, dentry); |
1009 | return d_splice_alias(inode, dentry); | ||
1010 | d_add(dentry, inode); | ||
1011 | return NULL; | ||
1012 | } | 1009 | } |
1013 | 1010 | ||
1014 | 1011 | ||