diff options
author | Lennart Poettering <lennart@poettering.net> | 2020-09-07 18:50:41 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2020-09-08 18:10:26 +0200 |
commit | 67f0ac8c79bb08451a70ee314daf06ee081ef24d (patch) | |
tree | 9b28afb41391a09a3ba94b2302fdbbf98b3d115b | |
parent | man: fix quickhelp listing in sysusers.d(5) (diff) | |
download | systemd-67f0ac8c79bb08451a70ee314daf06ee081ef24d.tar.xz systemd-67f0ac8c79bb08451a70ee314daf06ee081ef24d.zip |
btrfs: if BTRFS_IOC_DEV_INFO returns /dev/root generate a friendly error message
On systems that boot without initrd on a btrfs root file systems the
BTRFS_IOC_DEV_INFO ioctl returns /dev/root as backing device. That
sucks, since that is not a real device visible to userspace.
Since this has been that way since forever, and it doesn't look like the
kernel will get fixed soon for this, let's at least generate a useful
error message in this case.
This is not a bug fix, just a tweak to make this more recognizable.
Once the kernel gets fixed to report the correct device nodes in this
case, in a way userspace can make sense of them things will magically
work for systemd, too.
(Note that this doesn't add a log message about this to really all cases
we call get_device() in, but just the main ones that are called in early
boot context, after all all there's no benefit in seeing this message
too many times.)
https://github.com/systemd/systemd/issues/16953
https://bugs.freedesktop.org/show_bug.cgi?id=84689
https://bugzilla.kernel.org/show_bug.cgi?id=89721
-rw-r--r-- | src/basic/btrfs-util.c | 9 | ||||
-rw-r--r-- | src/basic/btrfs-util.h | 6 | ||||
-rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 4 | ||||
-rw-r--r-- | src/partition/growfs.c | 3 | ||||
-rw-r--r-- | src/partition/repart.c | 6 |
5 files changed, 28 insertions, 0 deletions
diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c index 71e1bc92eb..7de7770737 100644 --- a/src/basic/btrfs-util.c +++ b/src/basic/btrfs-util.c @@ -315,6 +315,15 @@ int btrfs_get_block_device_fd(int fd, dev_t *dev) { return -errno; } + /* For the root fs — when no initrd is involved — btrfs returns /dev/root on any kernels from + * the past few years. That sucks, as we have no API to determine the actual root then. let's + * return an recognizable error for this case, so that the caller can maybe print a nice + * message about this. + * + * https://bugzilla.kernel.org/show_bug.cgi?id=89721 */ + if (path_equal((char*) di.path, "/dev/root")) + return -EUCLEAN; + if (stat((char*) di.path, &st) < 0) return -errno; diff --git a/src/basic/btrfs-util.h b/src/basic/btrfs-util.h index c1bbb42ca1..d9cb95af00 100644 --- a/src/basic/btrfs-util.h +++ b/src/basic/btrfs-util.h @@ -121,3 +121,9 @@ int btrfs_qgroup_find_parents(int fd, uint64_t qgroupid, uint64_t **ret); int btrfs_qgroup_get_quota_fd(int fd, uint64_t qgroupid, BtrfsQuotaInfo *quota); int btrfs_qgroup_get_quota(const char *path, uint64_t qgroupid, BtrfsQuotaInfo *quota); + +static inline int btrfs_log_dev_root(int level, int ret, const char *p) { + return log_full_errno(level, ret, + "File system behind %s is reported by btrfs to be backed by pseudo-device /dev/root, which is not a valid userspace accessible device node. " + "Cannot determine correct backing block device.", p); +} diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 02d8837ca9..d1c90266a8 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -729,10 +729,14 @@ static int add_mounts(void) { int r; r = get_block_device_harder("/", &devno); + if (r == -EUCLEAN) + return btrfs_log_dev_root(LOG_ERR, r, "root file system"); if (r < 0) return log_error_errno(r, "Failed to determine block device of root file system: %m"); if (r == 0) { r = get_block_device_harder("/usr", &devno); + if (r == -EUCLEAN) + return btrfs_log_dev_root(LOG_ERR, r, "/usr"); if (r < 0) return log_error_errno(r, "Failed to determine block device of /usr file system: %m"); if (r == 0) { diff --git a/src/partition/growfs.c b/src/partition/growfs.c index c097963e0c..8c1a84d981 100644 --- a/src/partition/growfs.c +++ b/src/partition/growfs.c @@ -11,6 +11,7 @@ #include <sys/vfs.h> #include "blockdev-util.h" +#include "btrfs-util.h" #include "cryptsetup-util.h" #include "device-nodes.h" #include "dissect-image.h" @@ -212,6 +213,8 @@ static int run(int argc, char *argv[]) { return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "\"%s\" is not a mount point: %m", arg_target); r = get_block_device(arg_target, &devno); + if (r == -EUCLEAN) + return btrfs_log_dev_root(LOG_ERR, r, arg_target); if (r < 0) return log_error_errno(r, "Failed to determine block device of \"%s\": %m", arg_target); diff --git a/src/partition/repart.c b/src/partition/repart.c index bcbf2273e8..f5015b73a1 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -3369,6 +3369,8 @@ static int context_open_copy_block_paths(Context *context) { /* Special support for btrfs */ r = btrfs_get_block_device_fd(source_fd, &devt); + if (r == -EUCLEAN) + return btrfs_log_dev_root(LOG_ERR, r, p->copy_blocks_path); if (r < 0) return log_error_errno(r, "Unable to determine backing block device of '%s': %m", p->copy_blocks_path); @@ -3833,6 +3835,8 @@ static int find_root(char **ret, int *ret_fd) { } r = acquire_root_devno(arg_node, O_RDONLY|O_CLOEXEC, ret, ret_fd); + if (r == -EUCLEAN) + return btrfs_log_dev_root(LOG_ERR, r, arg_node); if (r < 0) return log_error_errno(r, "Failed to open file or determine backing device of %s: %m", arg_node); @@ -3860,6 +3864,8 @@ static int find_root(char **ret, int *ret_fd) { r = acquire_root_devno(p, O_RDONLY|O_DIRECTORY|O_CLOEXEC, ret, ret_fd); if (r < 0) { + if (r == -EUCLEAN) + return btrfs_log_dev_root(LOG_ERR, r, p); if (r != -ENODEV) return log_error_errno(r, "Failed to determine backing device of %s: %m", p); } else |