From: Al Viro Date: Sun, 17 Jul 2011 14:07:34 +0000 (-0400) Subject: ufs should use d_splice_alias() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=642c937b4ed2e51d2f2e4c46ab7cd8b5bddf268b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ufs should use d_splice_alias() it's NFS-exportable, so... Signed-off-by: Al Viro --- diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c index 29309e25417f..b57aab9a1184 100644 --- a/fs/ufs/namei.c +++ b/fs/ufs/namei.c @@ -56,16 +56,12 @@ static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, stru lock_ufs(dir->i_sb); ino = ufs_inode_by_name(dir, &dentry->d_name); - if (ino) { + if (ino) inode = ufs_iget(dir->i_sb, ino); - if (IS_ERR(inode)) { - unlock_ufs(dir->i_sb); - return ERR_CAST(inode); - } - } unlock_ufs(dir->i_sb); - d_add(dentry, inode); - return NULL; + if (IS_ERR(inode)) + return ERR_CAST(inode); + return d_splice_alias(inode, dentry); } /*