diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-06-21 20:24:00 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-06-24 09:42:08 +0200 |
| commit | 65ddc2c5ffd5b9d7798dfd4743423f08b4be6c2b (patch) | |
| tree | 632093ab24eb7eb219d6390f4bf3fcc70efa4691 /src/shared/discover-image.c | |
| parent | 9c6535367d07650bb531beb6cce57497862a36da (diff) | |
| download | systemd-65ddc2c5ffd5b9d7798dfd4743423f08b4be6c2b.tar.gz | |
basic: drop one btrfs-related function and move another
This will become useful later, it is the first step to moving btrfs-util.[ch]
out of src/basic/.
Diffstat (limited to 'src/shared/discover-image.c')
| -rw-r--r-- | src/shared/discover-image.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shared/discover-image.c b/src/shared/discover-image.c index c572e8dae8..5c833afc78 100644 --- a/src/shared/discover-image.c +++ b/src/shared/discover-image.c @@ -4,6 +4,7 @@ #include <fcntl.h> #include <linux/fs.h> #include <linux/loop.h> +#include <linux/magic.h> #include <stdio.h> #include <stdlib.h> #include <sys/file.h> @@ -34,6 +35,7 @@ #include "os-util.h" #include "path-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" @@ -262,7 +264,7 @@ static int image_make( if (btrfs_might_be_subvol(st)) { - r = btrfs_is_filesystem(fd); + r = fd_is_fs_type(fd, BTRFS_SUPER_MAGIC); if (r < 0) return r; if (r) { |