SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

volume_id: set reiser instead of reiserfs for filesystem type

Browse Source 
Thanks to Theodore Ts'o <tytso@mit.edu> for the hint and a test image.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
Kay Sievers
2005-09-18 05:06:10 +02:00
parent 0e5f8a1fcc
commit 3a9fc64167
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/volume_id/volume_id/reiserfs.c
+8 -3
View File
@@ -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;
}
extras/volume_id/volume_id/volume_id.h
+1 -1
View File
@@ -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