diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-25 14:22:43 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-25 14:22:43 +0100 |
| commit | 7c8871d31510865e40c8628ef765996202a3cc00 (patch) | |
| tree | 622b7aa085999fe3d2908772ff0d0c6ec5bf4400 /src/core/umount.c | |
| parent | Merge pull request #1667 from evverx/run-protect-system (diff) | |
| parent | util-lib: move formats-util.h from shared/ to basic/ (diff) | |
| download | systemd-7c8871d31510865e40c8628ef765996202a3cc00.tar.xz systemd-7c8871d31510865e40c8628ef765996202a3cc00.zip | |
Merge pull request #1654 from poettering/util-lib
Various changes to src/basic/
Diffstat (limited to 'src/core/umount.c')
| -rw-r--r-- | src/core/umount.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/core/umount.c b/src/core/umount.c index 22dbe67259..0e61bcaebb 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -21,20 +21,24 @@ #include <errno.h> #include <fcntl.h> +#include <linux/dm-ioctl.h> +#include <linux/loop.h> #include <string.h> #include <sys/mount.h> #include <sys/swap.h> -#include <linux/loop.h> -#include <linux/dm-ioctl.h> +#include "libudev.h" + +#include "escape.h" +#include "fd-util.h" #include "list.h" #include "mount-setup.h" -#include "umount.h" #include "path-util.h" +#include "string-util.h" +#include "udev-util.h" +#include "umount.h" #include "util.h" #include "virt.h" -#include "libudev.h" -#include "udev-util.h" typedef struct MountPoint { char *path; |