X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fufs.c;h=bedcfa47da4e3adf063e4cce5f128936dd8b8b68;hb=be9c76b4345b36ec40d8b7b22dc687b4042fe56f;hp=d3960b1bec3754251651409faad9b5e278f739dd;hpb=83cc6ab4760817509f1ed1ee429669e563f82caf;p=elogind.git

diff --git a/extras/volume_id/lib/ufs.c b/extras/volume_id/lib/ufs.c
index d3960b1be..bedcfa47d 100644
--- a/extras/volume_id/lib/ufs.c
+++ b/extras/volume_id/lib/ufs.c
@@ -168,27 +168,27 @@ struct ufs_super_block {
 #define UFS_MAGIC_FEA			0x00195612
 #define UFS_MAGIC_LFN			0x00095014
 
-int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
+int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	uint32_t magic;
 	int i;
 	struct ufs_super_block *ufs;
 	int offsets[] = {0, 8, 64, 256, -1};
 
-	dbg("probing at offset 0x%llx", (unsigned long long) off);
+	info("probing at offset 0x%llx\n", (unsigned long long) off);
 
 	for (i = 0; offsets[i] >= 0; i++) {	
 		ufs = (struct ufs_super_block *) volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800);
 		if (ufs == NULL)
 			return -1;
 
-		dbg("offset 0x%x", offsets[i] * 0x400);
+		dbg("offset 0x%x\n", offsets[i] * 0x400);
 		magic = be32_to_cpu(ufs->fs_magic);
 		if ((magic == UFS_MAGIC) ||
 		    (magic == UFS2_MAGIC) ||
 		    (magic == UFS_MAGIC_FEA) ||
 		    (magic == UFS_MAGIC_LFN)) {
-			dbg("magic 0x%08x(be)", magic);
+			dbg("magic 0x%08x(be)\n", magic);
 			goto found;
 		}
 		magic = le32_to_cpu(ufs->fs_magic);
@@ -196,7 +196,7 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
 		    (magic == UFS2_MAGIC) ||
 		    (magic == UFS_MAGIC_FEA) ||
 		    (magic == UFS_MAGIC_LFN)) {
-			dbg("magic 0x%08x(le)", magic);
+			dbg("magic 0x%08x(le)\n", magic);
 			goto found;
 		}
 	}
@@ -205,6 +205,18 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
 found:
 	volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
 	id->type = "ufs";
+	switch (magic) {
+	case UFS_MAGIC:
+		strcpy(id->type_version, "1");
+		break;
+	case UFS2_MAGIC:
+		strcpy(id->type_version, "2");
+		volume_id_set_label_raw(id, ufs->fs_u11.fs_u2.fs_volname, 32);
+		volume_id_set_label_string(id, ufs->fs_u11.fs_u2.fs_volname, 32);
+		break;
+	default:
+		break;
+	}
 
 	return 0;
 }