Changeset c3f95d8 in mainline for uspace

Timestamp:

2011-03-13T11:39:00Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5e3eea10

Parents:

f8c60f5 (diff), c1a5d8d (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:

Merged mainline changes

Location:

uspace

Files:

• app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (1 diff)
• app/bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)
• lib/block/libblock.c (modified) (2 diffs)
• lib/c/generic/loader.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (3 diffs)
• srv/devmap/devmap.c (modified) (2 diffs)
• srv/fs/fat/fat_ops.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -125 +125 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "s:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -31 +31 @@
 #include <vfs/vfs.h>
 #include <errno.h>
+#include <getopt.h>
 #include "config.h"
 #include "util.h"
@@ -40 +41 @@
 static const char *cmdname = "mount";
 
-/* Dispays help for mount in various levels */
+static struct option const long_options[] = {
+        { "help", no_argument, 0, 'h' },
+        { 0, 0, 0, 0 }
+};
+
+
+/* Displays help for mount in various levels */
 void help_cmd_mount(unsigned int level)
 {
@@ -60 +67 @@
         const char *mopts = "";
         const char *dev = "";
-        int rc;
+        int rc, c, opt_ind;
 
         argc = cli_count_args(argv);
 
+        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+                c = getopt_long(argc, argv, "h", long_options, &opt_ind);
+                switch (c) {
+                case 'h':
+                        help_cmd_mount(HELP_LONG);
+                        return CMD_SUCCESS;
+                }
+        }
+
         if ((argc < 3) || (argc > 5)) {
-                printf("%s: invalid number of arguments.\n",
+                printf("%s: invalid number of arguments. Try `mount --help'\n",
                     cmdname);
                 return CMD_FAILURE;

uspace/lib/block/libblock.c

@@ -412 +412 @@
         l = hash_table_find(&cache->block_hash, &key);
         if (l) {
+found:
                 /*
                  * We found the block in the cache.
@@ -494 +495 @@
                                         fibril_mutex_unlock(&b->lock);
                                         goto retry;
+                                }
+                                l = hash_table_find(&cache->block_hash, &key);
+                                if (l) {
+                                        /*
+                                         * Someone else must have already
+                                         * instantiated the block while we were
+                                         * not holding the cache lock.
+                                         * Leave the recycled block on the
+                                         * freelist and continue as if we
+                                         * found the block of interest during
+                                         * the first try.
+                                         */
+                                        fibril_mutex_unlock(&b->lock);
+                                        goto found;
                                 }
 

uspace/lib/c/generic/loader.c

@@ -160 +160 @@
         int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len);
         if (rc != EOK) {
+                free(pa);
                 async_wait_for(req, NULL);
                 return rc;

uspace/lib/c/generic/vfs/vfs.c

@@ -69 +69 @@
         char *ncwd_path;
         char *ncwd_path_nc;
+        size_t total_size; 
 
         fibril_mutex_lock(&cwd_mutex);
@@ -77 +78 @@
                         return NULL;
                 }
-                ncwd_path_nc = malloc(cwd_size + 1 + size + 1);
+                total_size = cwd_size + 1 + size + 1;
+                ncwd_path_nc = malloc(total_size);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
                         return NULL;
                 }
-                str_cpy(ncwd_path_nc, cwd_size + 1 + size + 1, cwd_path);
+                str_cpy(ncwd_path_nc, total_size, cwd_path);
                 ncwd_path_nc[cwd_size] = '/';
                 ncwd_path_nc[cwd_size + 1] = '\0';
         } else {
-                ncwd_path_nc = malloc(size + 1);
+                total_size = size + 1;
+                ncwd_path_nc = malloc(total_size);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
@@ -93 +96 @@
                 ncwd_path_nc[0] = '\0';
         }
-        str_append(ncwd_path_nc, cwd_size + 1 + size + 1, path);
+        str_append(ncwd_path_nc, total_size, path);
         ncwd_path = canonify(ncwd_path_nc, retlen);
         if (!ncwd_path) {

uspace/srv/devmap/devmap.c

@@ -123 +123 @@
 static devmap_handle_t last_handle = 0;
 static devmap_device_t *null_devices[NULL_DEVICES];
+
+/*
+ * Dummy list for null devices. This is necessary so that null devices can
+ * be used just as any other devices, e.g. in devmap_device_unregister_core().
+ */
+static LIST_INITIALIZE(dummy_null_driver_devices);
 
 static devmap_handle_t devmap_create_handle(void)
@@ -953 +959 @@
         device->name = dev_name;
         
-        /* Insert device into list of all devices
-           and into null devices array */
+        /*
+         * Insert device into list of all devices and into null devices array.
+         * Insert device into a dummy list of null driver's devices so that it
+         * can be safely removed later.
+         */
         list_append(&device->devices, &devices_list);
+        list_append(&device->driver_devices, &dummy_null_driver_devices);
         null_devices[i] = device;
         

uspace/srv/fs/fat/fat_ops.c

@@ -325 +325 @@
                     uint16_t_le2host(d->firstc));
                 if (rc != EOK) {
+                        (void) block_put(b);
                         (void) fat_node_put(FS_NODE(nodep));
                         return rc;
@@ -811 +812 @@
         fibril_mutex_unlock(&childp->idx->lock);
         childp->lnkcnt = 0;
+        childp->refcnt++;       /* keep the node in memory until destroyed */
         childp->dirty = true;
         fibril_mutex_unlock(&childp->lock);
@@ -1488 +1490 @@
         fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
         fs_node_t *fn;
+        fat_node_t *nodep;
         int rc;
 
@@ -1499 +1502 @@
                 return;
         }
+
+        nodep = FAT_NODE(fn);
+        /*
+         * We should have exactly two references. One for the above
+         * call to fat_node_get() and one from fat_unlink().
+         */
+        assert(nodep->refcnt == 2);
 
         rc = fat_destroy_node(fn);