[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 34cf167dc4f22cddd0995986bc004eec30130484..091c68aaf47c4bf1e45b1f7b8cfc889e3c574907 100644 (file)
--- 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;