diff options
| author | Karel Zak <kzak@redhat.com> | 2009-01-24 00:04:20 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2009-02-11 23:35:24 +0100 |
| commit | b1646690425fa3f4788e34c8606823f7d8af31b8 (patch) | |
| tree | 8462c4e00a4090205a90975e618dbe6a3099d6c7 /libs | |
| parent | f38ac42666536a7217df7d116556d0900f3e5d95 (diff) | |
| download | util-linux-old-b1646690425fa3f4788e34c8606823f7d8af31b8.tar.gz | |
blkid: add to reiser
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/blkid/src/probers/reiserfs.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/blkid/src/probers/reiserfs.c b/libs/blkid/src/probers/reiserfs.c index 1a2e03c7..29e1faa0 100644 --- a/libs/blkid/src/probers/reiserfs.c +++ b/libs/blkid/src/probers/reiserfs.c @@ -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; } |