From: hare@suse.de <hare@suse.de>
Date: Tue, 15 Mar 2005 23:46:44 +0000 (+0100)
Subject: [PATCH] volume_id: Fix label/uuid reading for reiserfs
X-Git-Tag: 055~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=cc44094d6353f9af4d8b485e5d7027a190200cb7

[PATCH] volume_id: Fix label/uuid reading for reiserfs

Well, I just asked our resident reiserfs guru (thx mason :-).
Reiser v3.5 does not support labels nor uuids.
---

diff --git a/extras/volume_id/volume_id/reiserfs.c b/extras/volume_id/volume_id/reiserfs.c
index 34cf167dc..091c68aaf 100644
--- a/extras/volume_id/volume_id/reiserfs.c
+++ b/extras/volume_id/volume_id/reiserfs.c
@@ -80,6 +80,10 @@ int volume_id_probe_reiserfs(struct volume_id *id, __u64 off)
 		return -1;
 
 	rs = (struct reiserfs_super_block *) buf;;
+	if (memcmp(rs->magic, "ReIsErFs", 8) == 0) {
+		strcpy(id->type_version, "3.5");
+		goto found;
+	}
 	if (memcmp(rs->magic, "ReIsEr2Fs", 9) == 0) {
 		strcpy(id->type_version, "3.6");
 		goto found_v3;
@@ -104,7 +108,7 @@ int volume_id_probe_reiserfs(struct volume_id *id, __u64 off)
 
 	if (memcmp(rs->magic, "ReIsErFs", 8) == 0) {
 		strcpy(id->type_version, "3.5");
-		goto found_v3;
+		goto found;
 	}
 
 	return -1;