From: Jori Koolstra <jkoolstra@xs4all.nl>
Date: Fri, 10 Jul 2026 16:42:31 +0000 (+0200)
Subject: vfs: move create error && negative dentry case in lookup_open() up
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=4d315e54aa898ea491ce2fe72ee482f74b7ba84a;p=thirdparty%2Flinux.git

vfs: move create error && negative dentry case in lookup_open() up

O_CREAT is stripped when create_error is set in lookup_open(), so when
lookup does not return an inode, the case

	if (!dentry->d_inode && (open_flag & O_CREAT))

is always skipped. We can get rid of this cognitive step by handling the
error case first.

Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
Link: https://patch.msgid.link/20260710164233.827744-2-jkoolstra@xs4all.nl
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
---

diff --git a/fs/namei.c b/fs/namei.c
index 3ca34388eda3..62f1b8600ec1 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -4513,6 +4513,11 @@ retry:
 		}
 	}
 
+	if (unlikely(create_error) && !dentry->d_inode) {
+		error = create_error;
+		goto out_dput;
+	}
+
 	/* Negative dentry, just create the file */
 	if (!dentry->d_inode && (open_flag & O_CREAT)) {
 		/* but break the directory lease first! */
@@ -4532,10 +4537,6 @@ retry:
 		if (error)
 			goto out_dput;
 	}
-	if (unlikely(create_error) && !dentry->d_inode) {
-		error = create_error;
-		goto out_dput;
-	}
 out:
 	if (!IS_ERR(dentry)) {
 		if (file->f_mode & FMODE_CREATED)