diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-12-20 15:15:43 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-03-01 14:11:07 +0100 |
| commit | 46c82d495613cb1aa89f6abf75289946db9996c7 (patch) | |
| tree | dcf287450ee73ac626a8e792114548375d1dbead /src/gpt-auto-generator | |
| parent | volatile-root: export original root (diff) | |
| download | systemd-46c82d495613cb1aa89f6abf75289946db9996c7.tar.xz systemd-46c82d495613cb1aa89f6abf75289946db9996c7.zip | |
gpt-auto-generator: rename open_parent() → open_parent_devno() so that we can include fs-util.h later
As that header also defines a function open_parent() which does
something different.
Diffstat (limited to 'src/gpt-auto-generator')
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 09c0bcba2d..0ce9cf06e2 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -483,7 +483,7 @@ static int add_root_rw(DissectedPartition *p) { return 0; } -static int open_parent(dev_t devnum, int *ret) { +static int open_parent_devno(dev_t devnum, int *ret) { _cleanup_(sd_device_unrefp) sd_device *d = NULL; const char *name, *devtype, *node; sd_device *parent; @@ -551,7 +551,7 @@ static int enumerate_partitions(dev_t devnum) { _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL; int r, k; - r = open_parent(devnum, &fd); + r = open_parent_devno(devnum, &fd); if (r <= 0) return r; |