diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:51:57 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 14:51:57 (GMT) |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /fs/efs/namei.c | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
| download | linux-7f79d852ed30a06eebf7497afe9334a726db3d40.tar.xz | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'fs/efs/namei.c')
| -rw-r--r-- | fs/efs/namei.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/efs/namei.c b/fs/efs/namei.c index 3a404e7..291abb1 100644 --- a/fs/efs/namei.c +++ b/fs/efs/namei.c @@ -74,8 +74,7 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei } unlock_kernel(); - d_add(dentry, inode); - return NULL; + return d_splice_alias(inode, dentry); } static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino, |