Changes in uspace/srv/fs/fat/fat_fat.c [db4ec8d:dba4a23] in mainline

File:

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

uspace/srv/fs/fat/fat_fat.c

@@ -424 +424 @@
                 for (c = 0; c < BPS(bs) / sizeof(fat_cluster_t); c++, cl++) {
                         /*
-                         * Check if the entire cluster is physically there.
-                         * This check becomes necessary when the file system is
-                         * created with fewer total sectors than how many is
-                         * inferred from the size of the file allocation table
-                         * or when the last cluster ends beyond the end of the
-                         * device.
+                         * Check if the cluster is physically there. This check
+                         * becomes necessary when the file system is created
+                         * with fewer total sectors than how many is inferred
+                         * from the size of the file allocation table.
                          */
-                        if ((cl >= FAT_CLST_FIRST) &&
-                            CLBN2PBN(bs, cl, SPC(bs) - 1) >= TS(bs)) {
+                        if ((cl >= 2) &&
+                            ((cl - 2) * SPC(bs) + SSA(bs) >= TS(bs))) {
                                 rc = block_put(blk);
                                 if (rc != EOK)
@@ -545 +543 @@
         dev_handle_t dev_handle = nodep->idx->dev_handle;
         fat_cluster_t lastc;
+        uint16_t numc;
         uint8_t fatno;
         int rc;
 
-        if (nodep->firstc == FAT_CLST_RES0) {
-                /* No clusters allocated to the node yet. */
-                nodep->firstc = mcl;
-                nodep->dirty = true;    /* need to sync node */
+        if (nodep->lastc_cached_valid) {
+                lastc = nodep->lastc_cached_value;
+                nodep->lastc_cached_valid = false;
         } else {
-                if (nodep->lastc_cached_valid) {
-                        lastc = nodep->lastc_cached_value;
-                        nodep->lastc_cached_valid = false;
-                } else {
-                        rc = fat_cluster_walk(bs, dev_handle, nodep->firstc,
-                            &lastc, NULL, (uint16_t) -1);
-                        if (rc != EOK)
-                                return rc;
+                rc = fat_cluster_walk(bs, dev_handle, nodep->firstc, &lastc,
+                    &numc, (uint16_t) -1);
+                if (rc != EOK)
+                        return rc;
+
+                if (numc == 0) {
+                        /* No clusters allocated to the node yet. */
+                        nodep->firstc = mcl;
+                        nodep->dirty = true;    /* need to sync node */
+                        return EOK;
                 }
-
-                for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
-                        rc = fat_set_cluster(bs, nodep->idx->dev_handle, fatno,
-                            lastc, mcl);
-                        if (rc != EOK)
-                                return rc;
-                }
+        }
+
+        for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
+                rc = fat_set_cluster(bs, nodep->idx->dev_handle, fatno, lastc,
+                    mcl);
+                if (rc != EOK)
+                        return rc;
         }