From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Tue, 15 Mar 2005 23:52:00 +0000 (+0100)
Subject: [PATCH] volume_id: version 43
X-Git-Tag: 055~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d227c5f34d96a560baed6dc1b9d9865db2e678d;p=systemd

[PATCH] volume_id: version 43
---

diff --git a/extras/volume_id/volume_id/reiserfs.c b/extras/volume_id/volume_id/reiserfs.c
index 091c68aa..a53fc4a5 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 63f95132..c7fa0d9b 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