Changeset 7431b665 in mainline

Timestamp:

2010-09-07T20:00:15Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2fa10f6

Parents:

3249673 (diff), db4ec8d (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 from lp:~jakub/helenos/fs.

File:

• uspace/srv/fs/fat/fat_fat.c (modified) (1 diff)

uspace/srv/fs/fat/fat_fat.c

@@ -545 +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;
+                }
         }