Changeset d2663d8 in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2013-09-13T16:02:09Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8c5ba67

Parents:

cc8044e (diff), fd7dbbb (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 mfs changes

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (2 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -216 +216 @@
         sbi->isearch = 0;
         sbi->zsearch = 0;
+        sbi->nfree_zones_valid = false;
+        sbi->nfree_zones = 0;
 
         if (version == MFS_VERSION_V3) {
@@ -1181 +1183 @@
                 return rc;
 
-        rc = mfs_count_free_zones(inst, &block_free);
-        *count = block_free;
+        struct mfs_sb_info *sbi = inst->sbi;
+
+        if (!sbi->nfree_zones_valid) {
+                /* The cached number of free zones is not valid,
+                 * we need to scan the bitmap to retrieve the
+                 * current value.
+                 */
+
+                rc = mfs_count_free_zones(inst, &block_free);
+                if (rc != EOK)
+                        return rc;
+
+                sbi->nfree_zones = block_free;
+                sbi->nfree_zones_valid = true;
+        }
+
+        *count = sbi->nfree_zones;
 
         return rc;