From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Mar 2018 14:34:54 +0000 (+0200)
Subject: fs-util: add shortcut for chase_symlinks() when it is called like open(O_PATH)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=25c7db66f9272d4ffce2ee5909f54e8522fa1198;p=elogind.git

fs-util: add shortcut for chase_symlinks() when it is called like open(O_PATH)

Let's optimize things, and let the kernel chase the paths if none of the
features chase_symlinks() offers are actually used.
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index d43aca249..fe8554842 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -649,6 +649,16 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
         if (noop_root(original_root))
                 original_root = NULL;
 
+        if (!original_root && !ret && (flags & (CHASE_NONEXISTENT|CHASE_NO_AUTOFS|CHASE_SAFE|CHASE_OPEN)) == CHASE_OPEN) {
+                /* Shortcut the CHASE_OPEN case if the caller isn't interested in the actual path and has no root set
+                 * and doesn't care about any of the other special features we provide either. */
+                r = open(path, O_PATH|O_CLOEXEC);
+                if (r < 0)
+                        return -errno;
+
+                return r;
+        }
+
         if (original_root) {
                 r = path_make_absolute_cwd(original_root, &root);
                 if (r < 0)