From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 14 Nov 2025 20:36:16 +0000 (+0100)
Subject: fs-util: simplify open_parent_at() a bit
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87ed096657bc2cd06635726e4dd3a96d8664444e;p=thirdparty%2Fsystemd.git

fs-util: simplify open_parent_at() a bit

Let's refrain from specifying any access mode when opening
a directory, which matches our usual style and allows us
to drop one condition.
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 8cbe29fc0f0..893e95c3c12 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -868,10 +868,8 @@ int open_parent_at(int dir_fd, const char *path, int flags, mode_t mode) {
         /* Let's insist on O_DIRECTORY since the parent of a file or directory is a directory. Except if we open an
          * O_TMPFILE file, because in that case we are actually create a regular file below the parent directory. */
 
-        if (FLAGS_SET(flags, O_PATH))
+        if (!FLAGS_SET(flags, O_TMPFILE))
                 flags |= O_DIRECTORY;
-        else if (!FLAGS_SET(flags, O_TMPFILE))
-                flags |= O_DIRECTORY|O_RDONLY;
 
         return RET_NERRNO(openat(dir_fd, parent, flags, mode));
 }