Changes in / [d2663d8:cc8044e] in mainline

Location:

uspace/srv/fs/mfs

Files:

• mfs.h (modified) (2 diffs)
• mfs_balloc.c (modified) (2 diffs)
• mfs_ops.c (modified) (2 diffs)

uspace/srv/fs/mfs/mfs.h

@@ -44 +44 @@
 #include <errno.h>
 #include <assert.h>
-#include <stdbool.h>
 #include "../../vfs/vfs.h"
 
@@ -106 +105 @@
         unsigned isearch;
         unsigned zsearch;
-
-        /* Indicates wether if the cached number of free zones
-         * is to be considered valid or not.
-         */
-        bool nfree_zones_valid;
-        /* Cached number of free zones, used to avoid to scan
-         * the whole bitmap every time the mfs_free_block_count()
-         * is invoked.
-         */
-        unsigned nfree_zones;
 };
 

uspace/srv/fs/mfs/mfs_balloc.c

@@ -88 +88 @@
 {
         int r = mfs_alloc_bit(inst, zone, BMAP_ZONE);
-        if (r != EOK)
-                return r;
-
-        /* Update the cached number of free zones */
-        struct mfs_sb_info *sbi = inst->sbi;
-        if (sbi->nfree_zones_valid)
-                sbi->nfree_zones--;
 
         *zone += inst->sbi->firstdatazone - 1;
@@ -110 +103 @@
 mfs_free_zone(struct mfs_instance *inst, uint32_t zone)
 {
-        int r;
-
         zone -= inst->sbi->firstdatazone - 1;
 
-        r = mfs_free_bit(inst, zone, BMAP_ZONE);
-        if (r != EOK)
-                return r;
-
-        /* Update the cached number of free zones */
-        struct mfs_sb_info *sbi = inst->sbi;
-        if (sbi->nfree_zones_valid)
-                sbi->nfree_zones++;
-
-        return r;
+        return mfs_free_bit(inst, zone, BMAP_ZONE);
 }
 

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) {
@@ -1183 +1181 @@
                 return rc;
 
-        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;
+        rc = mfs_count_free_zones(inst, &block_free);
+        *count = block_free;
 
         return rc;