blkid: use /dev/mapper/<name> rather than /dev/dm-<N>
PATCH 1/1 blkid: use /dev/mapper/<name> rather than /dev/dm-<N>
The libblkid (since v1.41.1) returns private device-mapper names (e.g. /dev/dm-0). It's because the probe_one() function scans /dev before /dev/mapper.
brw-rw---- 1 root disk 253, 0 2009-04-27 13:41 /dev/dm-0
brw-rw---- 1 root disk 253, 0 2009-04-27 13:41 /dev/mapper/TestVolGroup-TestLogVolume
Old version:
# blkid -t LABEL="TEST-LABEL" -o device /dev/dm-0
Fixed version:
# blkid -t LABEL="TEST-LABEL" -o device /dev/mapper/TestVolGroup-TestLogVolume
Addresses-Red-Hat-Bug: #497259
--- lib/blkid/devname.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)
lib/blkid/devname.c +12 -4
@@ -179,6 +179,15 @@ static void probe_one(blkid_cache cache, const char *ptname,if (dev && dev->bid_devno == devno) goto set_pri; +/* Try to translate private device-mapper dm-<N> names +* to standard /dev/mapper/<name>. +*/ +if (!strncmp (ptname,"dm-" ,3 ) &&isdigit (ptname[3 ])) { +blkid__scan_dir ("/dev/mapper" , devno,0 , &devname); +if (devname) + goto get_dev; + } +/* * Take a quick look at /dev/ptname for the device number. We check * all of the likely device directories. If we don't find it, or if
@@ -197,17 +206,16 @@ static void probe_one(blkid_cache cache, const char *ptname,if (stat (device, &st) ==0 &&S_ISBLK (st.st_mode) && st.st_rdev == devno) { devname =blkid_strdup (device); -break ; + goto get_dev; } } -/* Do a short-cut scan of /dev/mapper first */ -if (!devname) -blkid__scan_dir ("/dev/mapper" , devno,0 , &devname);if (!devname) { devname =blkid_devno_to_devname (devno);if (!devname)return ; } + +get_dev: dev =blkid_get_dev (cache, devname,BLKID_DEV_NORMAL );free (devname);
Signature · 1 line
1.6.0.6
PATCH 1/1 blkid: use /sys/block/dm-<N>/dm/name
The Linux kernel (since 2.6.29, patch 784aae735d9b0bba3f8b9faef4c8b30df3bf0128) exports the real DM device names in /sys/block/<ptname>/dm/name.
The sysfs based solution is nicer and faster than scan for devno in /dev/mapper/.
--- lib/blkid/devname.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-)
lib/blkid/devname.c +27 -1
@@ -153,6 +153,30 @@ static int is_dm_leaf(const char *devname) }/* +* Since 2.6.29 (patch 784aae735d9b0bba3f8b9faef4c8b30df3bf0128) kernel sysfs +* provides the real DM device names in /sys/block/<ptname>/dm/name +*/ +static char *get_dm_name (const char *ptname) +{ +FILE *f; +size_t sz; +char path[256 ], name[256 ], *res =NULL ; + +snprintf (path,sizeof (path),"/sys/block/%s/dm/name" , ptname); +if ((f =fopen (path,"r" )) ==NULL ) +return NULL ; + +/* read "<name>\n" from sysfs */ +if (fgets (name,sizeof (name), f) && (sz =strlen (name)) >1 ) { + name[sz -1 ] ='\0' ; +snprintf (path,sizeof (path),"/dev/mapper/%s" , name); + res =blkid_strdup (path); + } +fclose (f); +return res; +} + +/* * Probe a single block device to add to the device cache. */ static void probe_one(blkid_cache cache, const char *ptname,
@@ -183,7 +207,9 @@ static void probe_one(blkid_cache cache, const char *ptname,* to standard /dev/mapper/<name>. */ if (!strncmp (ptname,"dm-" ,3 ) &&isdigit (ptname[3 ])) { -blkid__scan_dir ("/dev/mapper" , devno,0 , &devname); + devname =get_dm_name (ptname); +if (!devname) +blkid__scan_dir ("/dev/mapper" , devno,0 , &devname);if (devname) goto get_dev; }
Signature · 1 line
1.6.0.6
Theodore Tso
AppliedRe: [PATCH] blkid: use /sys/block/dm-<N>/dm/name
Quoted 2 lines · Karel Zak
The Linux kernel (since 2.6.29, patch
784aae735d9b0bba3f8b9faef4c8b30df3bf0128) exports the real DM device names in /sys/block/<ptname>/dm/name.
Thanks, applied.
- Ted
Quoted 3 lines · Karel Zak
The libblkid (since v1.41.1) returns private device-mapper names (e.g.
/dev/dm-0). It's because theprobe_one()function scans /dev before/dev/mapper.
Checked in, thanks. Debian-derived distributions don't create /dev/dm-X names, which is why I didn't notice this issue. However, because of this, I modified your patch to keep this chunk which you removed:
lib/blkid/devname.c static void probe_one(blkid_cache cache, const char *ptname, · line 205
Quoted 3 lines
lib/blkid/devname.c +0
-3-/* Do a short-cut scan of /dev/mapper first */ -if (!devname) -blkid__scan_dir ("/dev/mapper" , devno,0 , &devname);
For distributions that don't create /dev/dm-X devices, your check above won't find the device name, so after searching /dev, we need to do a short-cut scan of /dev/mapper before we do a full brute force search via blkid_devno_to_devname.
- Ted
Quoted 8 lines · Theodore Tso
Quoted 3 lines · Karel Zak
The libblkid (since v1.41.1) returns private device-mapper names (e.g.
/dev/dm-0). It's because theprobe_one()function scans /dev before/dev/mapper.Checked in, thanks. Debian-derived distributions don't create
/dev/dm-Xnames, which is why I didn't notice this issue. However, because of this, I modified your patch to keep this chunk which you removed:
You needn't this chunk.
Quoted 5 lines
lib/blkid/devname.c static void probe_one(blkid_cache cache, const char *ptname, · line 205
Quoted 3 lines
lib/blkid/devname.c +0
-3-/* Do a short-cut scan of /dev/mapper first */ -if (!devname) -blkid__scan_dir ("/dev/mapper" , devno,0 , &devname);For distributions that don't create
/dev/dm-Xdevices, your check
I guess that all distributions have "dm-X" names in /proc/partitions, it means my check
if (!strncmp(ptname, "dm-", 3) && isdigit(ptname[3]))
blkid__scan_dir("/dev/mapper", devno, 0, &devname); works everywhere and you needn't to check /dev before /dev/mapper for dm-X ptnames.
Quoted 3 lines
above won't find the device name, so after searching /dev, we need to do a short-cut scan of
/dev/mapperbefore we do a full brute force search viablkid_devno_to_devname.
Karel
Signature · 1 line
Karel Zak <[email protected]>