diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-26 16:34:54 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
| commit | ef80cac536e2864258725a1392bb3726c4f09dbe (patch) | |
| tree | 947af6f3d57d42f9e63227d32ca8079d0595f8ab /src/basic/fs-util.c | |
| parent | 63c466f3bf2dce3f7c19fb2e7bbf9f081ac60030 (diff) | |
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.
Diffstat (limited to 'src/basic/fs-util.c')
| -rw-r--r-- | src/basic/fs-util.c | 10 |
1 files changed, 10 insertions, 0 deletions
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) |