summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-03-16 00:52:00 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:53:53 -0700
commit7d227c5f34d96a560baed6dc1b9d9865db2e678d (patch)
tree0e50509c2b6bf1948259853c04407ca253614575
parentcc44094d6353f9af4d8b485e5d7027a190200cb7 (diff)
[PATCH] volume_id: version 43
-rw-r--r--extras/volume_id/volume_id/reiserfs.c6
-rw-r--r--extras/volume_id/volume_id/volume_id.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/extras/volume_id/volume_id/reiserfs.c b/extras/volume_id/volume_id/reiserfs.c
index 091c68aaf4..a53fc4a5a9 100644
--- a/extras/volume_id/volume_id/reiserfs.c
+++ b/extras/volume_id/volume_id/reiserfs.c
@@ -86,11 +86,11 @@ int volume_id_probe_reiserfs(struct volume_id *id, __u64 off)
}
if (memcmp(rs->magic, "ReIsEr2Fs", 9) == 0) {
strcpy(id->type_version, "3.6");
- goto found_v3;
+ goto found_label;
}
if (memcmp(rs->magic, "ReIsEr3Fs", 9) == 0) {
strcpy(id->type_version, "JR");
- goto found_v3;
+ goto found_label;
}
rs4 = (struct reiser4_super_block *) buf;
@@ -113,7 +113,7 @@ int volume_id_probe_reiserfs(struct volume_id *id, __u64 off)
return -1;
-found_v3:
+found_label:
volume_id_set_label_raw(id, rs->label, 16);
volume_id_set_label_string(id, rs->label, 16);
volume_id_set_uuid(id, rs->uuid, UUID_DCE);
diff --git a/extras/volume_id/volume_id/volume_id.h b/extras/volume_id/volume_id/volume_id.h
index 63f95132df..c7fa0d9bea 100644
--- a/extras/volume_id/volume_id/volume_id.h
+++ b/extras/volume_id/volume_id/volume_id.h
@@ -21,7 +21,7 @@
#ifndef _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_UUID_SIZE 36