From 96931dfe437cbd480fcfa72bd05b41b9ef15522e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 11 Nov 2023 01:55:03 -0500 Subject: nilfs2: d_obtain_alias(ERR_PTR(...)) will do the right thing... Acked-by: Ryusuke Konishi Signed-off-by: Al Viro --- fs/nilfs2/namei.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'fs/nilfs2') diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index 2a4e7f4a8102..8e8c7c981a7a 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c @@ -439,7 +439,6 @@ out: static struct dentry *nilfs_get_parent(struct dentry *child) { unsigned long ino; - struct inode *inode; struct nilfs_root *root; ino = nilfs_inode_by_name(d_inode(child), &dotdot_name); @@ -448,11 +447,7 @@ static struct dentry *nilfs_get_parent(struct dentry *child) root = NILFS_I(d_inode(child))->i_root; - inode = nilfs_iget(child->d_sb, root, ino); - if (IS_ERR(inode)) - return ERR_CAST(inode); - - return d_obtain_alias(inode); + return d_obtain_alias(nilfs_iget(child->d_sb, root, ino)); } static struct dentry *nilfs_get_dentry(struct super_block *sb, u64 cno, -- cgit v1.2.3