Skip to content

rootdev: Only use stat.rdev instead of looking up /sys/block/DEV/dev #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pothos merged 1 commit into from
Sep 23, 2025
Merged

rootdev: Only use stat.rdev instead of looking up /sys/block/DEV/dev #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 6 additions & 28 deletions src/rootdev/rootdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ dev_t rootdev_devt_from_mountpoint(const char *orig_path) {
char * devname = NULL;
size_t len = 0;
dev_t dev = 0;
struct stat path_stat;

mounts = fopen("/proc/mounts", "r");
if (mounts == NULL)
Expand All @@ -256,34 +257,11 @@ dev_t rootdev_devt_from_mountpoint(const char *orig_path) {
if (mountpoint == NULL)
continue;
if (strcmp(mountpoint, path) == 0) {
char devname_buf[PATH_SIZE];
char devname_parent[PATH_SIZE];
char sys_block_path[PATH_SIZE * 3];
char *tmp;

if (readlink(devname, (char *)&devname_buf, PATH_SIZE - 1) != -1) {
devname_buf[PATH_SIZE - 1] = '\0';
devname = devname_buf;
}
devname = strtok(devname, "/");
if (devname == NULL)
break;
/* skip to last part of the path */
while (tmp=strtok(NULL,"/"), tmp != NULL) {
devname = tmp;
}

strncpy(devname_parent, devname, PATH_SIZE - 1);
devname_parent[PATH_SIZE - 1] = '\0';
rootdev_strip_partition(devname_parent, PATH_SIZE);
if (strcmp(devname_parent, devname) == 0) {
snprintf(sys_block_path, PATH_SIZE * 3, "/sys/block/%s/dev", devname);
} else {
snprintf(sys_block_path, PATH_SIZE * 3, "/sys/block/%s/%s/dev", devname_parent, devname);
}
dev = devt_from_file(sys_block_path);
/* Note: devname may hold a reference to buf and must not be used from now on, delete it */
devname = NULL;
/* stat follows symlinks */
if (stat(devname, &path_stat) != 0)
err(1, "Cannot stat(%s)", devname);

dev = path_stat.st_rdev;
break;
}
}
Expand Down