dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-15 20:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #552 from poettering/path-is-mount-point-simplification

Browse Source 
basic: simplify path_is_mount_point() a bit
This commit is contained in:
Daniel Mack
2015-07-11 13:35:24 -04:00
parent 49aa7ab6e1 10c03e9e82
commit 0dc705bee2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/path-util.c
View File

@@ -656,9 +656,11 @@ int path_is_mount_point(const char *t, int flags) {
canonical = canonicalize_file_name(t);
if (!canonical)
return -errno;
t = canonical;
}
r = path_get_parent(canonical ?: t, &parent);
r = path_get_parent(t, &parent);
if (r < 0)
return r;
@@ -666,7 +668,7 @@ int path_is_mount_point(const char *t, int flags) {
if (fd < 0)
return -errno;
return fd_is_mount_point(fd, basename(canonical ?: t), flags);
return fd_is_mount_point(fd, basename(t), flags);
}
int path_is_read_only_fs(const char *path) {