diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-26 17:30:56 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-27 13:25:55 +0100 |
| commit | 5f311f8c0e51e2f13773823feb6a71f7c6f2838c (patch) | |
| tree | 6edfc648016e7000715e11c1ede94fde32e88d82 /src/core/mount.c | |
| parent | e4e73a632524c382139034d4271f53b6089ab4cb (diff) | |
util: remove path_get_parent(), in favour of dirname_malloc()
We don't need two functions that do essentialy the same, hence drop
path_get_parent(), and stick to dirname_malloc(), but move it to
path-util.[ch].
Diffstat (limited to 'src/core/mount.c')
| -rw-r--r-- | src/core/mount.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 59f56bdefa..9d8b55da58 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -252,9 +252,10 @@ static int mount_add_mount_links(Mount *m) { if (!path_equal(m->where, "/")) { /* Adds in links to other mount points that might lie further * up in the hierarchy */ - r = path_get_parent(m->where, &parent); - if (r < 0) - return r; + + parent = dirname_malloc(m->where); + if (!parent) + return -ENOMEM; r = unit_require_mounts_for(UNIT(m), parent); if (r < 0) |