--- trunk/mkinitrd-magellan/busybox/util-linux/volume_id/fat.c	2010/04/29 20:38:48	983
+++ trunk/mkinitrd-magellan/busybox/util-linux/volume_id/fat.c	2010/05/30 11:32:42	984
@@ -54,7 +54,7 @@
 			uint8_t		magic[8];
 			uint8_t		dummy2[192];
 			uint8_t		pmagic[2];
-		} __attribute__((__packed__)) fat;
+		} PACKED fat;
 		struct fat32_super_block {
 			uint32_t	fat32_length;
 			uint16_t	flags;
@@ -69,9 +69,9 @@
 			uint8_t		magic[8];
 			uint8_t		dummy2[164];
 			uint8_t		pmagic[2];
-		} __attribute__((__packed__)) fat32;
-	} __attribute__((__packed__)) type;
-} __attribute__((__packed__));
+		} PACKED fat32;
+	} PACKED type;
+} PACKED;
 
 struct vfat_dir_entry {
 	uint8_t		name[11];
@@ -85,7 +85,7 @@
 	uint16_t	date_write;
 	uint16_t	cluster_low;
 	uint32_t	size;
-} __attribute__((__packed__));
+} PACKED;
 
 static uint8_t *get_attr_volume_id(struct vfat_dir_entry *dir, int count)
 {
@@ -119,8 +119,9 @@
 	return NULL;
 }
 
-int volume_id_probe_vfat(struct volume_id *id, uint64_t fat_partition_off)
+int FAST_FUNC volume_id_probe_vfat(struct volume_id *id /*,uint64_t fat_partition_off*/)
 {
+#define fat_partition_off ((uint64_t)0)
 	struct vfat_super_block *vs;
 	struct vfat_dir_entry *dir;
 	uint16_t sector_size_bytes;
@@ -245,7 +246,7 @@
 	buf_size = dir_entries * sizeof(struct vfat_dir_entry);
 	buf = volume_id_get_buffer(id, fat_partition_off + root_start_off, buf_size);
 	if (buf == NULL)
-		goto found;
+		goto ret;
 
 	label = get_attr_volume_id((struct vfat_dir_entry*) buf, dir_entries);
 
@@ -261,7 +262,7 @@
 		volume_id_set_label_string(id, vs->type.fat.label, 11);
 	}
 	volume_id_set_uuid(id, vs->type.fat.serno, UUID_DOS);
-	goto found;
+	goto ret;
 
  fat32:
 	/* FAT32 root dir is a cluster chain like any other directory */
@@ -272,20 +273,20 @@
 	next_cluster = root_cluster;
 	maxloop = 100;
 	while (--maxloop) {
-		uint32_t next_off_sct;
+		uint64_t next_off_sct;
 		uint64_t next_off;
 		uint64_t fat_entry_off;
 		int count;
 
 		dbg("next_cluster 0x%x", (unsigned)next_cluster);
-		next_off_sct = (next_cluster - 2) * vs->sectors_per_cluster;
+		next_off_sct = (uint64_t)(next_cluster - 2) * vs->sectors_per_cluster;
 		next_off = (start_data_sct + next_off_sct) * sector_size_bytes;
 		dbg("cluster offset 0x%llx", (unsigned long long) next_off);
 
 		/* get cluster */
 		buf = volume_id_get_buffer(id, fat_partition_off + next_off, buf_size);
 		if (buf == NULL)
-			goto found;
+			goto ret;
 
 		dir = (struct vfat_dir_entry*) buf;
 		count = buf_size / sizeof(struct vfat_dir_entry);
@@ -300,7 +301,7 @@
 		dbg("fat_entry_off 0x%llx", (unsigned long long)fat_entry_off);
 		buf = volume_id_get_buffer(id, fat_partition_off + fat_entry_off, buf_size);
 		if (buf == NULL)
-			goto found;
+			goto ret;
 
 		/* set next cluster */
 		next_cluster = le32_to_cpu(*(uint32_t*)buf) & 0x0fffffff;
@@ -323,7 +324,7 @@
 	}
 	volume_id_set_uuid(id, vs->type.fat32.serno, UUID_DOS);
 
- found:
+ ret:
 //	volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
 //	id->type = "vfat";