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

Timestamp:

2010-11-02T22:38:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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) (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 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.
+                         * 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.
                          */
-                        if ((cl >= 2) &&
-                            ((cl - 2) * SPC(bs) + SSA(bs) >= TS(bs))) {
+                        if ((cl >= FAT_CLST_FIRST) &&
+                            CLBN2PBN(bs, cl, SPC(bs) - 1) >= TS(bs)) {
                                 rc = block_put(blk);
                                 if (rc != EOK)
@@ -543 +545 @@
         dev_handle_t dev_handle = nodep->idx->dev_handle;
         fat_cluster_t lastc;
-        uint16_t numc;
         uint8_t fatno;
         int rc;
 
-        if (nodep->lastc_cached_valid) {
-                lastc = nodep->lastc_cached_value;
-                nodep->lastc_cached_valid = false;
+        if (nodep->firstc == FAT_CLST_RES0) {
+                /* No clusters allocated to the node yet. */
+                nodep->firstc = mcl;
+                nodep->dirty = true;    /* need to sync node */
         } else {
-                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;
+                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;
                 }
-        }
-
-        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;
+                }
         }