summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2006-01-14 13:21:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 18:27:12 -0800
commit2ff6b1c2575f13885c1d5291e4283682ad9a41cd (patch)
treed31fd027ec45f63ccf5669b8e58ce3a23887c19a /fs
parentba7fe369875075c3b0def9887afb7a44fa88175e (diff)
downloadop-kernel-dev-2ff6b1c2575f13885c1d5291e4283682ad9a41cd.zip
op-kernel-dev-2ff6b1c2575f13885c1d5291e4283682ad9a41cd.tar.gz
[PATCH] isofs: remove d_splice_alias NULL check from isofs_lookup
Remove redundant NULL check in isofs_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/isofs/namei.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index e37e82b..e7ba0c3 100644
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -185,8 +185,5 @@ struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct n
}
}
unlock_kernel();
- if (inode)
- return d_splice_alias(inode, dentry);
- d_add(dentry, inode);
- return NULL;
+ return d_splice_alias(inode, dentry);
}
OpenPOWER on IntegriCloud