Index: uspace/srv/fs/fat/fat_fat.c
===================================================================
--- uspace/srv/fs/fat/fat_fat.c	(revision 4dd939505a124d0c5b5065294f6a2d03630d044d)
+++ uspace/srv/fs/fat/fat_fat.c	(revision d9637426c5abea61ce3d9deac46768f90573616f)
@@ -82,7 +82,7 @@
 int
 fat_cluster_walk(fat_bs_t *bs, devmap_handle_t devmap_handle, fat_cluster_t firstc,
-    fat_cluster_t *lastc, uint16_t *numc, uint16_t max_clusters)
-{
-	uint16_t clusters = 0;
+    fat_cluster_t *lastc, uint32_t *numc, uint32_t max_clusters)
+{
+	uint32_t clusters = 0;
 	fat_cluster_t clst = firstc, clst_last1 = FAT_CLST_LAST1(bs);
 	fat_cluster_t clst_bad = FAT_CLST_BAD(bs);
@@ -199,6 +199,6 @@
     fat_cluster_t fcl, fat_cluster_t *clp, aoff64_t bn, int flags)
 {
-	uint16_t clusters;
-	unsigned max_clusters;
+	uint32_t clusters;
+	uint32_t max_clusters;
 	fat_cluster_t c;
 	int rc;
Index: uspace/srv/fs/fat/fat_fat.h
===================================================================
--- uspace/srv/fs/fat/fat_fat.h	(revision 4dd939505a124d0c5b5065294f6a2d03630d044d)
+++ uspace/srv/fs/fat/fat_fat.h	(revision d9637426c5abea61ce3d9deac46768f90573616f)
@@ -104,7 +104,7 @@
 
 #define fat_clusters_get(numc, bs, dh, fc) \
-    fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint16_t) -1)
+    fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint32_t) -1)
 extern int fat_cluster_walk(struct fat_bs *, devmap_handle_t, fat_cluster_t,
-    fat_cluster_t *, uint16_t *, uint16_t);
+    fat_cluster_t *, uint32_t *, uint32_t);
 
 extern int fat_block_get(block_t **, struct fat_bs *, struct fat_node *,