Changes in / [cc8044e:eb40d86] in mainline

Files:

• boot/grub.pc/stage2_eltorito (added)
• kernel/arch/amd64/include/arch/debugger.h (added)
• kernel/arch/arm32/include/arch/mach/testarm/testarm.h (added)
• kernel/arch/ia32/include/arch/debugger.h (added)
• kernel/genarch/include/genarch/fb/logo-196x66.h (added)
• uspace/drv/bus/usb/usbhid/kbd.h (added)
• uspace/drv/bus/usb/usbhid/kbd/layout.h (added)
• uspace/drv/bus/usb/usbhid/kbd/main.c (added)
• uspace/drv/bus/usb/usbhid/layout.h (added)
• uspace/drv/bus/usb/usbmast/scsi.h (added)
• uspace/srv/fs/mfs/mfs.h (modified) (2 diffs)
• uspace/srv/fs/mfs/mfs_balloc.c (modified) (2 diffs)
• uspace/srv/fs/mfs/mfs_ops.c (modified) (2 diffs)
• uspace/srv/hid/input/include/sun.h (added)
• uspace/srv/hid/input/port/dummy.c (added)
• uspace/srv/hid/input/port/sgcn.c (added)
• uspace/srv/hid/input/port/sun.c (added)
• uspace/srv/hid/input/port/z8530.c (added)
• uspace/srv/net/inetsrv/inet_util.c (added)
• uspace/srv/net/inetsrv/inet_util.h (added)
• uspace/srv/net/tcp/tcp_header.h (added)

uspace/srv/fs/mfs/mfs.h

@@ -44 +44 @@
 #include <errno.h>
 #include <assert.h>
+#include <stdbool.h>
 #include "../../vfs/vfs.h"
 
@@ -105 +106 @@
         unsigned isearch;
         unsigned zsearch;
+
+        bool nfree_zones_valid;
+        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;
@@ -103 +110 @@
 mfs_free_zone(struct mfs_instance *inst, uint32_t zone)
 {
+        int r;
+
         zone -= inst->sbi->firstdatazone - 1;
 
-        return mfs_free_bit(inst, zone, BMAP_ZONE);
+        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;
 }
 

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;