]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
udf: d_obtain_alias(ERR_PTR(...)) will do the right thing...
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 11 Nov 2023 06:55:30 +0000 (01:55 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 21 Dec 2023 17:49:36 +0000 (12:49 -0500)
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/udf/namei.c

index 92f25e5404307471f7ee1c1e5bc10492f525f24b..a64102d63781a1127c08e3bf87495390fe35e368 100644 (file)
@@ -897,7 +897,6 @@ out_oiter:
 static struct dentry *udf_get_parent(struct dentry *child)
 {
        struct kernel_lb_addr tloc;
-       struct inode *inode = NULL;
        struct udf_fileident_iter iter;
        int err;
 
@@ -907,11 +906,7 @@ static struct dentry *udf_get_parent(struct dentry *child)
 
        tloc = lelb_to_cpu(iter.fi.icb.extLocation);
        udf_fiiter_release(&iter);
-       inode = udf_iget(child->d_sb, &tloc);
-       if (IS_ERR(inode))
-               return ERR_CAST(inode);
-
-       return d_obtain_alias(inode);
+       return d_obtain_alias(udf_iget(child->d_sb, &tloc));
 }