diff options
Diffstat (limited to 'extras/volume_id')
| -rw-r--r-- | extras/volume_id/volume_id/reiserfs.c | 11 | ||||
| -rw-r--r-- | extras/volume_id/volume_id/volume_id.h | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/extras/volume_id/volume_id/reiserfs.c b/extras/volume_id/volume_id/reiserfs.c index 75d1be05dc..6cffdce8d8 100644 --- a/extras/volume_id/volume_id/reiserfs.c +++ b/extras/volume_id/volume_id/reiserfs.c @@ -82,14 +82,17 @@ int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off) rs = (struct reiserfs_super_block *) buf;; if (memcmp(rs->magic, "ReIsErFs", 8) == 0) { strcpy(id->type_version, "3.5"); + id->type = "reiserfs"; goto found; } if (memcmp(rs->magic, "ReIsEr2Fs", 9) == 0) { strcpy(id->type_version, "3.6"); + id->type = "reiserfs"; goto found_label; } if (memcmp(rs->magic, "ReIsEr3Fs", 9) == 0) { strcpy(id->type_version, "JR"); + id->type = "reiserfs"; goto found_label; } @@ -99,15 +102,18 @@ int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off) volume_id_set_label_raw(id, rs4->label, 16); volume_id_set_label_string(id, rs4->label, 16); volume_id_set_uuid(id, rs4->uuid, UUID_DCE); + id->type = "reiser4"; goto found; } - rs = (struct reiserfs_super_block *) volume_id_get_buffer(id, off + REISERFS1_SUPERBLOCK_OFFSET, 0x200); - if (rs == NULL) + buf = volume_id_get_buffer(id, off + REISERFS1_SUPERBLOCK_OFFSET, 0x200); + if (buf == NULL) return -1; + rs = (struct reiserfs_super_block *) buf; if (memcmp(rs->magic, "ReIsErFs", 8) == 0) { strcpy(id->type_version, "3.5"); + id->type = "reiserfs"; goto found; } @@ -120,7 +126,6 @@ found_label: found: volume_id_set_usage(id, VOLUME_ID_FILESYSTEM); - id->type = "reiserfs"; return 0; } diff --git a/extras/volume_id/volume_id/volume_id.h b/extras/volume_id/volume_id/volume_id.h index 84f8fb6740..0f5716b893 100644 --- a/extras/volume_id/volume_id/volume_id.h +++ b/extras/volume_id/volume_id/volume_id.h @@ -23,7 +23,7 @@ #include <stdint.h> -#define VOLUME_ID_VERSION 48 +#define VOLUME_ID_VERSION 49 #define VOLUME_ID_LABEL_SIZE 64 #define VOLUME_ID_UUID_SIZE 36 |