ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/sysfs; add sysfs_partno_to_devno() 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-08-13 22:06:18 +02:00
parent f369387731
commit 778ad369f6
2 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sysfs.h
View File

@ -57,6 +57,7 @@ extern char *sysfs_strdup(struct sysfs_cxt *cxt, const char *attr);
extern int sysfs_count_dirents(struct sysfs_cxt *cxt, const char *attr);
extern int sysfs_count_partitions(struct sysfs_cxt *cxt, const char *devname);
extern dev_t sysfs_partno_to_devno(struct sysfs_cxt *cxt, int partno);
extern char *sysfs_get_slave(struct sysfs_cxt *cxt);
extern int sysfs_is_partition_dirent(DIR *dir, struct dirent *d,

57
lib/sysfs.c
View File

@ -320,6 +320,45 @@ int sysfs_is_partition_dirent(DIR *dir, struct dirent *d, const char *parent_nam
return faccessat(dirfd(dir), path, R_OK, 0) == 0;
}
/*
* Copnverts @partno (partition number) to devno of the partition. The @cxt
* handles wholedisk device.
*
* Note that this code does not expect any special format of the
* partitions devnames.
*/
dev_t sysfs_partno_to_devno(struct sysfs_cxt *cxt, int partno)
{
DIR *dir;
struct dirent *d;
char path[256];
dev_t devno = 0;
dir = sysfs_opendir(cxt, NULL);
if (!dir)
return 0;
while ((d = xreaddir(dir))) {
int n, maj, min;
if (!sysfs_is_partition_dirent(dir, d, NULL))
continue;
snprintf(path, sizeof(path), "%s/partition", d->d_name);
if (sysfs_read_int(cxt, path, &n) || n != partno)
continue;
snprintf(path, sizeof(path), "%s/dev", d->d_name);
if (sysfs_scanf(cxt, path, "%d:%d", &maj, &min) == 2)
devno = makedev(maj, min);
break;
}
closedir(dir);
return devno;
}
int sysfs_scanf(struct sysfs_cxt *cxt, const char *attr, const char *fmt, ...)
{
FILE *f = sysfs_fopen(cxt, attr);
@ -605,7 +644,7 @@ int main(int argc, char *argv[])
char *devname;
dev_t devno;
char path[PATH_MAX];
int i;
int i, is_part;
uint64_t u64;
ssize_t len;
@ -618,12 +657,13 @@ int main(int argc, char *argv[])
if (!devno)
err(EXIT_FAILURE, "failed to read devno");
is_part = sysfs_devno_has_attribute(devno, "partition");
printf("NAME: %s\n", devname);
printf("DEVNO: %u\n", (unsigned int) devno);
printf("DEVNO: %u (%d:%d)\n", (unsigned int) devno, major(devno), minor(devno));
printf("DEVNOPATH: %s\n", sysfs_devno_path(devno, path, sizeof(path)));
printf("DEVPATH: %s\n", sysfs_devno_to_devpath(devno, path, sizeof(path)));
printf("PARTITION: %s\n",
sysfs_devno_has_attribute(devno, "partition") ? "YES" : "NOT");
printf("PARTITION: %s\n", is_part ? "YES" : "NOT");
if (sysfs_init(&cxt, devno, NULL))
return EXIT_FAILURE;
@ -634,6 +674,15 @@ int main(int argc, char *argv[])
printf("DEVNOLINK: %s\n", path);
}
if (!is_part) {
printf("First 5 partitions:\n");
for (i = 1; i <= 5; i++) {
dev_t dev = sysfs_partno_to_devno(&cxt, i);
if (dev)
printf("\t#%d %d:%d\n", i, major(dev), minor(dev));
}
}
printf("SLAVES: %d\n", sysfs_count_dirents(&cxt, "slaves"));
if (sysfs_read_u64(&cxt, "size", &u64))