From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Jan 2021 17:05:56 +0000 (+0100)
Subject: stat-util: don't try to open path on path_is_temporary_fs()
X-Git-Tag: v248-rc1~422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15308e5083391f6a1b9ce25c5b7323f37544eab8;p=thirdparty%2Fsystemd.git

stat-util: don't try to open path on path_is_temporary_fs()

I mean, the old code at least used O_PATH, but still, we shouldn't
allocate/close an fd if we don't have to.
---

diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 41c92e69de8..f999681636d 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -226,13 +226,12 @@ int fd_is_network_fs(int fd) {
 }
 
 int path_is_temporary_fs(const char *path) {
-        _cleanup_close_ int fd = -1;
+        struct statfs s;
 
-        fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_PATH);
-        if (fd < 0)
+        if (statfs(path, &s) < 0)
                 return -errno;
 
-        return fd_is_temporary_fs(fd);
+        return is_temporary_fs(&s);
 }
 
 int stat_verify_regular(const struct stat *st) {