summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhare@suse.de <hare@suse.de>2005-03-16 00:46:44 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:53:18 -0700
commitcc44094d6353f9af4d8b485e5d7027a190200cb7 (patch)
treeaa3115eb12f58b1e4ad57035d2cd14db73e711ab
parent29e8ed4c27a311be32cc039f3d284d9836f3021d (diff)
downloadsystemd-cc44094d6353f9af4d8b485e5d7027a190200cb7.tar.gz
[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.
-rw-r--r--extras/volume_id/volume_id/reiserfs.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/extras/volume_id/volume_id/reiserfs.c b/extras/volume_id/volume_id/reiserfs.c
index 34cf167dc4..091c68aaf4 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;