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

blkid: add to reiser 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2009-01-24 00:04:20 +01:00
parent f38ac42666
commit b164669042
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/blkid/src/probers/reiserfs.c
View File

@ -59,13 +59,20 @@ static int probe_reiser(blkid_probe pr, const struct blkid_idmag *mag)
/* LABEL/UUID are only valid for later versions of Reiserfs v3.6. */
if (mag->magic[6] == '2' || mag->magic[6] == '3') {
if (strlen(rs->rs_label))
if (*rs->rs_label)
blkid_probe_set_label(pr,
(unsigned char *) rs->rs_label,
sizeof(rs->rs_label));
blkid_probe_set_uuid(pr, rs->rs_uuid);
}
if (mag->magic[6] == '3')
blkid_probe_set_version(pr, "JR");
else if (mag->magic[6] == '2')
blkid_probe_set_version(pr, "3.6");
else
blkid_probe_set_version(pr, "3.5");
return 0;
}
@ -77,9 +84,10 @@ static int probe_reiser4(blkid_probe pr, const struct blkid_idmag *mag)
if (!rs4)
return -1;
if (strlen((char *) rs4->rs4_label))
if (*rs4->rs4_label)
blkid_probe_set_label(pr, rs4->rs4_label, sizeof(rs4->rs4_label));
blkid_probe_set_uuid(pr, rs4->rs4_uuid);
blkid_probe_set_version(pr, "4");
return 0;
}

1
tests/expected/blkid/low-probe-reiser3
View File

@ -4,3 +4,4 @@ ID_FS_TYPE=reiser
ID_FS_USAGE=filesystem
ID_FS_UUID=9efe7863-b124-46dc-ad68-8ecd04230a7b
ID_FS_UUID_ENC=9efe7863-b124-46dc-ad68-8ecd04230a7b
ID_FS_VERSION=JR

1
tests/expected/blkid/low-probe-reiser4
View File

@ -4,3 +4,4 @@ ID_FS_TYPE=reiser4
ID_FS_USAGE=filesystem
ID_FS_UUID=9722633c-d69a-4881-b1c8-bedecbbf39d2
ID_FS_UUID_ENC=9722633c-d69a-4881-b1c8-bedecbbf39d2
ID_FS_VERSION=4