Changeset 383ddd6 in mainline for uspace/srv/fs/fat/fat_fat.c

Timestamp:

2010-01-20T20:33:55Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/fs/fat/fat_fat.c

@@ -247 +247 @@
  */
 int
-fat_get_cluster(fat_bs_t *bs, dev_handle_t dev_handle, fat_cluster_t clst,
-    fat_cluster_t *value)
+fat_get_cluster(fat_bs_t *bs, dev_handle_t dev_handle, unsigned fatno,
+    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;
@@ -258 +259 @@
         bps = uint16_t_le2host(bs->bps);
         rscnt = uint16_t_le2host(bs->rscnt);
-
-        rc = block_get(&b, dev_handle, rscnt +
+        sf = uint16_t_le2host(bs->sec_per_fat);
+
+        rc = block_get(&b, dev_handle, rscnt + sf * fatno +
             (clst * sizeof(fat_cluster_t)) / bps, BLOCK_FLAGS_NONE);
         if (rc != EOK)
@@ -398 +400 @@
                          * 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)
@@ -480 +482 @@
         while (firstc < FAT_CLST_LAST1) {
                 assert(firstc >= FAT_CLST_FIRST && firstc < FAT_CLST_BAD);
-                rc = fat_get_cluster(bs, dev_handle, firstc, &nextc);
+                rc = fat_get_cluster(bs, dev_handle, FAT1, firstc, &nextc);
                 if (rc != EOK)
                         return rc;
@@ -560 +562 @@
                 unsigned fatno;
 
-                rc = fat_get_cluster(bs, dev_handle, lastc, &nextc);
+                rc = fat_get_cluster(bs, dev_handle, FAT1, lastc, &nextc);
                 if (rc != EOK)
                         return rc;