diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:43:07 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:43:07 +0100 |
| commit | a524db35ac5c2099671d16318524e277e88631be (patch) | |
| tree | 54b29c42a317b9a13c3049ff85b14f7dce734cf6 /shared/systemd/src/basic/stat-util.c | |
| parent | 6917e28d2d16138d6d497dc96efafe573b4b0979 (diff) | |
| parent | 724bcc5c7be3aed3646ed2b2989c34d438217176 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream
Diffstat (limited to 'shared/systemd/src/basic/stat-util.c')
| -rw-r--r-- | shared/systemd/src/basic/stat-util.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/shared/systemd/src/basic/stat-util.c b/shared/systemd/src/basic/stat-util.c index c9837fa1..071050f2 100644 --- a/shared/systemd/src/basic/stat-util.c +++ b/shared/systemd/src/basic/stat-util.c @@ -2,12 +2,9 @@ #include "nm-sd-adapt-shared.h" -#include <dirent.h> #include <errno.h> #include <fcntl.h> -#include <linux/magic.h> #include <sched.h> -#include <sys/stat.h> #include <sys/statvfs.h> #include <sys/types.h> #include <unistd.h> @@ -17,7 +14,8 @@ #include "fd-util.h" #include "fs-util.h" #include "macro.h" -#include "missing.h" +#include "missing_fs.h" +#include "missing_magic.h" #include "parse-util.h" #include "stat-util.h" #include "string-util.h" @@ -340,7 +338,7 @@ int device_path_make_canonical(mode_t mode, dev_t devno, char **ret) { if (r < 0) return r; - return chase_symlinks(p, NULL, 0, ret); + return chase_symlinks(p, NULL, 0, ret, NULL); } int device_path_parse_major_minor(const char *path, mode_t *ret_mode, dev_t *ret_devno) { |