Changes in uspace/srv/fs/fat/fat_fat.c [711e1f32:50f9c3a] in mainline

File:

• uspace/srv/fs/fat/fat_fat.c (modified) (6 diffs)

uspace/srv/fs/fat/fat_fat.c

@@ -46 +46 @@
 #include <align.h>
 #include <assert.h>
-#include <fibril_synch.h>
+#include <fibril_sync.h>
 #include <mem.h>
 
@@ -247 +247 @@
  */
 int
-fat_get_cluster(fat_bs_t *bs, dev_handle_t dev_handle, unsigned fatno,
-    fat_cluster_t clst, fat_cluster_t *value)
+fat_get_cluster(fat_bs_t *bs, dev_handle_t dev_handle, fat_cluster_t clst,
+    fat_cluster_t *value)
 {
         block_t *b;
         uint16_t bps;
         uint16_t rscnt;
-        uint16_t sf;
         fat_cluster_t *cp;
         int rc;
@@ -259 +258 @@
         bps = uint16_t_le2host(bs->bps);
         rscnt = uint16_t_le2host(bs->rscnt);
-        sf = uint16_t_le2host(bs->sec_per_fat);
-
-        rc = block_get(&b, dev_handle, rscnt + sf * fatno +
+
+        rc = block_get(&b, dev_handle, rscnt +
             (clst * sizeof(fat_cluster_t)) / bps, BLOCK_FLAGS_NONE);
         if (rc != EOK)
@@ -400 +398 @@
                          * from the size of the file allocation table.
                          */
-                        if ((cl - 2) * bs->spc + ssa >= ts) {
+                        if ((cl >= 2) && ((cl - 2) * bs->spc + ssa >= ts)) {
                                 rc = block_put(blk);
                                 if (rc != EOK)
@@ -482 +480 @@
         while (firstc < FAT_CLST_LAST1) {
                 assert(firstc >= FAT_CLST_FIRST && firstc < FAT_CLST_BAD);
-                rc = fat_get_cluster(bs, dev_handle, FAT1, firstc, &nextc);
+                rc = fat_get_cluster(bs, dev_handle, firstc, &nextc);
                 if (rc != EOK)
                         return rc;
@@ -562 +560 @@
                 unsigned fatno;
 
-                rc = fat_get_cluster(bs, dev_handle, FAT1, lastc, &nextc);
+                rc = fat_get_cluster(bs, dev_handle, lastc, &nextc);
                 if (rc != EOK)
                         return rc;