Changes in / [ab4bace:b73c26d] in mainline

Files:

• kernel/generic/src/ipc/ipc.c (modified) (6 diffs)
• uspace/srv/fs/fat/fat_fat.c (modified) (1 diff)
• uspace/srv/fs/fat/fat_fat.h (modified) (1 diff)
• uspace/srv/fs/fat/fat_idx.c (modified) (1 diff)
• uspace/srv/fs/fat/fat_ops.c (modified) (2 diffs)
• uspace/srv/vfs/vfs.c (modified) (1 diff)
• uspace/srv/vfs/vfs.h (modified) (2 diffs)
• uspace/srv/vfs/vfs_file.c (modified) (1 diff)
• uspace/srv/vfs/vfs_ops.c (modified) (1 diff)

kernel/generic/src/ipc/ipc.c

@@ -212 +212 @@
  *
  * @param call          Call structure to be answered.
- * @param selflocked    If true, then TASK->answebox is locked.
- */
-static void _ipc_answer_free_call(call_t *call, bool selflocked)
+ */
+static void _ipc_answer_free_call(call_t *call)
 {
         answerbox_t *callerbox = call->callerbox;
-        bool do_lock = ((!selflocked) || callerbox != (&TASK->answerbox));
 
         call->flags |= IPC_CALL_ANSWERED;
@@ -228 +226 @@
         }
 
-        if (do_lock)
-                spinlock_lock(&callerbox->lock);
+        spinlock_lock(&callerbox->lock);
         list_append(&call->link, &callerbox->answers);
-        if (do_lock)
-                spinlock_unlock(&callerbox->lock);
+        spinlock_unlock(&callerbox->lock);
         waitq_wakeup(&callerbox->wq, WAKEUP_FIRST);
 }
@@ -248 +244 @@
         spinlock_unlock(&box->lock);
         /* Send back answer */
-        _ipc_answer_free_call(call, false);
+        _ipc_answer_free_call(call);
 }
 
@@ -265 +261 @@
         atomic_inc(&phone->active_calls);
         IPC_SET_RETVAL(call->data, err);
-        _ipc_answer_free_call(call, false);
+        _ipc_answer_free_call(call);
 }
 
@@ -304 +300 @@
                 if (call->flags & IPC_CALL_FORWARDED) {
                         IPC_SET_RETVAL(call->data, EFORWARD);
-                        _ipc_answer_free_call(call, false);
+                        _ipc_answer_free_call(call);
                 } else {
                         if (phone->state == IPC_PHONE_HUNGUP)
@@ -459 +455 @@
 
                 IPC_SET_RETVAL(call->data, EHANGUP);
-                _ipc_answer_free_call(call, true);
+                _ipc_answer_free_call(call);
         }
 }

uspace/srv/fs/fat/fat_fat.c

@@ -608 +608 @@
 }
 
-/** Perform basic sanity checks on the file system.
- *
- * Verify if values of boot sector fields are sane. Also verify media
- * descriptor. This is used to rule out cases when a device obviously
- * does not contain a fat file system.
- */
-int fat_sanity_check(fat_bs_t *bs, dev_handle_t dev_handle)
-{
-        fat_cluster_t e0, e1;
-        unsigned fat_no;
-        int rc;
-
-        /* Check number of FATs. */
-        if (bs->fatcnt == 0)
-                return ENOTSUP;
-
-        /* Check total number of sectors. */
-
-        if (bs->totsec16 == 0 && bs->totsec32 == 0)
-                return ENOTSUP;
-
-        if (bs->totsec16 != 0 && bs->totsec32 != 0 &&
-            bs->totsec16 != bs->totsec32) 
-                return ENOTSUP;
-
-        /* Check media descriptor. Must be between 0xf0 and 0xff. */
-        if ((bs->mdesc & 0xf0) != 0xf0)
-                return ENOTSUP;
-
-        /* Check number of sectors per FAT. */
-        if (bs->sec_per_fat == 0)
-                return ENOTSUP;
-
-        /*
-         * Check that the root directory entries take up whole blocks.
-         * This check is rather strict, but it allows us to treat the root
-         * directory and non-root directories uniformly in some places.
-         * It can be removed provided that functions such as fat_read() are
-         * sanitized to support file systems with this property.
-         */
-        if ((uint16_t_le2host(bs->root_ent_max) * sizeof(fat_dentry_t)) %
-            uint16_t_le2host(bs->bps) != 0)
-                return ENOTSUP;
-
-        /* Check signature of each FAT. */
-
-        for (fat_no = 0; fat_no < bs->fatcnt; fat_no++) {
-                rc = fat_get_cluster(bs, dev_handle, fat_no, 0, &e0);
-                if (rc != EOK)
-                        return EIO;
-
-                rc = fat_get_cluster(bs, dev_handle, fat_no, 1, &e1);
-                if (rc != EOK)
-                        return EIO;
-
-                /* Check that first byte of FAT contains the media descriptor. */
-                if ((e0 & 0xff) != bs->mdesc)
-                        return ENOTSUP;
-
-                /*
-                 * Check that remaining bits of the first two entries are
-                 * set to one.
-                 */
-                if ((e0 >> 8) != 0xff || e1 != 0xffff)
-                        return ENOTSUP;
-        }
-
-        return EOK;
-}
-
 /**
  * @}

uspace/srv/fs/fat/fat_fat.h

@@ -87 +87 @@
     off_t);
 extern int fat_zero_cluster(struct fat_bs *, dev_handle_t, fat_cluster_t);
-extern int fat_sanity_check(struct fat_bs *, dev_handle_t);
 
 #endif

uspace/srv/fs/fat/fat_idx.c

@@ -531 +531 @@
         unused_initialize(u, dev_handle);
         fibril_mutex_lock(&unused_lock);
-        if (!unused_find(dev_handle, false)) {
+        if (!unused_find(dev_handle, false))
                 list_append(&u->link, &unused_head);
-        } else {
-                free(u);
+        else
                 rc = EEXIST;
-        }
         fibril_mutex_unlock(&unused_lock);
         return rc;

uspace/srv/fs/fat/fat_ops.c

@@ -290 +290 @@
 
         *nodepp = nodep;
+        return EOK;
+}
+
+/** Perform basic sanity checks on the file system.
+ *
+ * Verify if values of boot sector fields are sane. Also verify media
+ * descriptor. This is used to rule out cases when a device obviously
+ * does not contain a fat file system.
+ */
+static int fat_sanity_check(fat_bs_t *bs, dev_handle_t dev_handle)
+{
+        fat_cluster_t e0, e1;
+        unsigned fat_no;
+        int rc;
+
+        /* Check number of FATs. */
+        if (bs->fatcnt == 0)
+                return ENOTSUP;
+
+        /* Check total number of sectors. */
+
+        if (bs->totsec16 == 0 && bs->totsec32 == 0)
+                return ENOTSUP;
+
+        if (bs->totsec16 != 0 && bs->totsec32 != 0 &&
+            bs->totsec16 != bs->totsec32) 
+                return ENOTSUP;
+
+        /* Check media descriptor. Must be between 0xf0 and 0xff. */
+        if ((bs->mdesc & 0xf0) != 0xf0)
+                return ENOTSUP;
+
+        /* Check number of sectors per FAT. */
+        if (bs->sec_per_fat == 0)
+                return ENOTSUP;
+
+        /*
+         * Check that the root directory entries take up whole blocks.
+         * This check is rather strict, but it allows us to treat the root
+         * directory and non-root directories uniformly in some places.
+         * It can be removed provided that functions such as fat_read() are
+         * sanitized to support file systems with this property.
+         */
+        if ((uint16_t_le2host(bs->root_ent_max) * sizeof(fat_dentry_t)) %
+            uint16_t_le2host(bs->bps) != 0)
+                return ENOTSUP;
+
+        /* Check signature of each FAT. */
+
+        for (fat_no = 0; fat_no < bs->fatcnt; fat_no++) {
+                rc = fat_get_cluster(bs, dev_handle, fat_no, 0, &e0);
+                if (rc != EOK)
+                        return EIO;
+
+                rc = fat_get_cluster(bs, dev_handle, fat_no, 1, &e1);
+                if (rc != EOK)
+                        return EIO;
+
+                /* Check that first byte of FAT contains the media descriptor. */
+                if ((e0 & 0xff) != bs->mdesc)
+                        return ENOTSUP;
+
+                /*
+                 * Check that remaining bits of the first two entries are
+                 * set to one.
+                 */
+                if ((e0 >> 8) != 0xff || e1 != 0xffff)
+                        return ENOTSUP;
+        }
+
         return EOK;
 }
@@ -945 +1015 @@
                 cmode = CACHE_MODE_WB;
 
-        free(opts);
-
         /* initialize libblock */
         rc = block_init(dev_handle, BS_SIZE);

uspace/srv/vfs/vfs.c

@@ -137 +137 @@
         }
         
-        vfs_files_done();
+        /* TODO: cleanup after the client */
 }
 

uspace/srv/vfs/vfs.h

@@ -177 +177 @@
     vfs_pair_t *, ...);
 extern int vfs_open_node_internal(vfs_lookup_res_t *);
-extern int vfs_close_internal(vfs_file_t *);
 
 extern bool vfs_nodes_init(void);
@@ -189 +188 @@
 
 extern bool vfs_files_init(void);
-extern void vfs_files_done(void);
 extern vfs_file_t *vfs_file_get(int);
 extern int vfs_fd_assign(vfs_file_t *file, int fd);

uspace/srv/vfs/vfs_file.c

@@ -72 +72 @@
         }
         return true;
-}
-
-/** Cleanup the table of open files. */
-void vfs_files_done(void)
-{
-        int i;
-
-        if (!files)
-                return;
-
-        for (i = 0; i < MAX_OPEN_FILES; i++) {
-                if (files[i]) {
-                        (void) vfs_close_internal(files[i]);
-                        (void) vfs_fd_free(i);
-                }
-        }
-        
-        free(files);
 }
 

uspace/srv/vfs/vfs_ops.c

@@ -817 +817 @@
 }
 
-int vfs_close_internal(vfs_file_t *file)
+static int vfs_close_internal(vfs_file_t *file)
 {
         /*