summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2006-01-14 13:21:08 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 18:27:10 -0800
commitba7fe369875075c3b0def9887afb7a44fa88175e (patch)
tree2b1052b698a66b67e981fbdea526c4b09df65ede
parent082a05c6f02e00982dd42ddae434fbc806a822e5 (diff)
downloadop-kernel-dev-ba7fe369875075c3b0def9887afb7a44fa88175e.zip
op-kernel-dev-ba7fe369875075c3b0def9887afb7a44fa88175e.tar.gz
[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.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index af193a3..8bd8ac0 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
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);
}
OpenPOWER on IntegriCloud