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

libblkid: ignore private Stratis devices 

[kzak@redhat.com: - tiny coding style changes]

References: 20e1c3dc03
Signed-off-by: Tony Asleson <tasleson@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Tony Asleson 2018-03-08 15:41:26 -06:00 committed by Karel Zak
parent e34dcfb69d
commit 80ec018c6a
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disk-utils/fdisk-list.c
View File

@ -334,7 +334,7 @@ char *next_proc_partition(FILE **f)
if (devno <= 0)
continue;
if (sysfs_devno_is_lvm_private(devno, NULL) ||
if (sysfs_devno_is_dm_private(devno, NULL) ||
sysfs_devno_is_wholedisk(devno) <= 0)
continue;

2
include/sysfs.h
View File

@ -81,7 +81,7 @@ extern int sysfs_is_partition_dirent(DIR *dir, struct dirent *d,
extern int sysfs_devno_to_wholedisk(dev_t dev, char *diskname,
size_t len, dev_t *diskdevno);
extern int sysfs_devno_is_lvm_private(dev_t devno, char **uuid);
extern int sysfs_devno_is_dm_private(dev_t devno, char **uuid);
extern int sysfs_devno_is_wholedisk(dev_t devno);
extern int sysfs_scsi_get_hctl(struct sysfs_cxt *cxt, int *h,

24
lib/sysfs.c
View File

@ -844,10 +844,10 @@ err:
}
/*
* Returns 1 if the device is private LVM device. The @uuid (if not NULL)
* returns DM device UUID, use free() to deallocate.
* Returns 1 if the device is private device mapper device. The @uuid
* (if not NULL) returns DM device UUID, use free() to deallocate.
*/
int sysfs_devno_is_lvm_private(dev_t devno, char **uuid)
int sysfs_devno_is_dm_private(dev_t devno, char **uuid)
{
struct sysfs_cxt cxt = UL_SYSFSCXT_EMPTY;
char *id = NULL;
@ -857,15 +857,21 @@ int sysfs_devno_is_lvm_private(dev_t devno, char **uuid)
return 0;
id = sysfs_strdup(&cxt, "dm/uuid");
if (id) {
/* Private LVM devices use "LVM-<uuid>-<name>" uuid format (important
* is the "LVM" prefix and "-<name>" postfix).
*/
if (strncmp(id, "LVM-", 4) == 0) {
char *p = strrchr(id + 4, '-');
/* Private LVM devices use "LVM-<uuid>-<name>" uuid format (important
* is the "LVM" prefix and "-<name>" postfix).
*/
if (id && strncmp(id, "LVM-", 4) == 0) {
char *p = strrchr(id + 4, '-');
if (p && *(p + 1))
rc = 1;
if (p && *(p + 1))
/* Private Stratis devices prefix the UUID with "stratis-1-private"
*/
} else if (strncmp(id, "stratis-1-private", 17) == 0) {
rc = 1;
}
}
sysfs_deinit(&cxt);

4
libblkid/src/probe.c
View File

@ -923,8 +923,8 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
pr->flags |= BLKID_FL_TINY_DEV;
if (S_ISBLK(sb.st_mode) &&
sysfs_devno_is_lvm_private(sb.st_rdev, &dm_uuid)) {
DBG(LOWPROBE, ul_debug("ignore private LVM device"));
sysfs_devno_is_dm_private(sb.st_rdev, &dm_uuid)) {
DBG(LOWPROBE, ul_debug("ignore private device mapper device"));
pr->flags |= BLKID_FL_NOSCAN_DEV;
}

2
libblkid/src/verify.c
View File

@ -114,7 +114,7 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
(unsigned long)diff));
#endif
if (sysfs_devno_is_lvm_private(st.st_rdev, NULL)) {
if (sysfs_devno_is_dm_private(st.st_rdev, NULL)) {
blkid_free_dev(dev);
return NULL;
}