mirror of
https://github.com/systemd/systemd.git
synced 2024-12-25 01:34:28 +03:00
[PATCH] volume_id: version 43
This commit is contained in:
parent
cc44094d63
commit
7d227c5f34
@ -86,11 +86,11 @@ int volume_id_probe_reiserfs(struct volume_id *id, __u64 off)
|
|||||||
}
|
}
|
||||||
if (memcmp(rs->magic, "ReIsEr2Fs", 9) == 0) {
|
if (memcmp(rs->magic, "ReIsEr2Fs", 9) == 0) {
|
||||||
strcpy(id->type_version, "3.6");
|
strcpy(id->type_version, "3.6");
|
||||||
goto found_v3;
|
goto found_label;
|
||||||
}
|
}
|
||||||
if (memcmp(rs->magic, "ReIsEr3Fs", 9) == 0) {
|
if (memcmp(rs->magic, "ReIsEr3Fs", 9) == 0) {
|
||||||
strcpy(id->type_version, "JR");
|
strcpy(id->type_version, "JR");
|
||||||
goto found_v3;
|
goto found_label;
|
||||||
}
|
}
|
||||||
|
|
||||||
rs4 = (struct reiser4_super_block *) buf;
|
rs4 = (struct reiser4_super_block *) buf;
|
||||||
@ -113,7 +113,7 @@ int volume_id_probe_reiserfs(struct volume_id *id, __u64 off)
|
|||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
found_v3:
|
found_label:
|
||||||
volume_id_set_label_raw(id, rs->label, 16);
|
volume_id_set_label_raw(id, rs->label, 16);
|
||||||
volume_id_set_label_string(id, rs->label, 16);
|
volume_id_set_label_string(id, rs->label, 16);
|
||||||
volume_id_set_uuid(id, rs->uuid, UUID_DCE);
|
volume_id_set_uuid(id, rs->uuid, UUID_DCE);
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#ifndef _VOLUME_ID_H_
|
#ifndef _VOLUME_ID_H_
|
||||||
#define _VOLUME_ID_H_
|
#define _VOLUME_ID_H_
|
||||||
|
|
||||||
#define VOLUME_ID_VERSION 42
|
#define VOLUME_ID_VERSION 43
|
||||||
|
|
||||||
#define VOLUME_ID_LABEL_SIZE 64
|
#define VOLUME_ID_LABEL_SIZE 64
|
||||||
#define VOLUME_ID_UUID_SIZE 36
|
#define VOLUME_ID_UUID_SIZE 36
|
||||||
|
Loading…
Reference in New Issue
Block a user