Changeset eb87adb in mainline for uspace

Timestamp:

2011-09-24T20:25:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d03da17

Parents:

4093b14 (diff), f1a9e87 (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 mainline changes

Location:

uspace

Files:

• app/bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)
• app/init/init.c (modified) (4 diffs)
• drv/bus/usb/usbhub/usbhub.c (modified) (1 diff)
• lib/c/arch/ia64/include/ddi.h (modified) (4 diffs)
• lib/c/generic/adt/hash_table.c (modified) (1 diff)
• lib/c/generic/adt/list.c (modified) (1 diff)
• lib/c/generic/malloc.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (2 diffs)
• lib/c/include/ipc/vfs.h (modified) (1 diff)
• lib/c/include/vfs/vfs.h (modified) (1 diff)
• srv/devman/main.c (modified) (2 diffs)
• srv/fs/cdfs/cdfs.c (modified) (2 diffs)
• srv/fs/exfat/exfat.c (modified) (2 diffs)
• srv/fs/ext2fs/ext2fs.c (modified) (2 diffs)
• srv/fs/fat/fat.c (modified) (2 diffs)
• srv/fs/locfs/locfs.c (modified) (2 diffs)
• srv/fs/mfs/mfs.c (modified) (3 diffs)
• srv/fs/tmpfs/tmpfs.c (modified) (2 diffs)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (3 diffs)
• srv/vfs/vfs_register.c (modified) (3 diffs)

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

@@ -43 +43 @@
 static struct option const long_options[] = {
         { "help", no_argument, 0, 'h' },
+        { "instance", required_argument, 0, 'i' },
         { 0, 0, 0, 0 }
 };
@@ -68 +69 @@
         const char *dev = "";
         int rc, c, opt_ind;
+        unsigned int instance = 0;
+        bool instance_set = false;
+        char **t_argv;
 
         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);
+                c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
                         help_cmd_mount(HELP_LONG);
                         return CMD_SUCCESS;
+                case 'i':
+                        instance = (unsigned int) strtol(optarg, NULL, 10);
+                        instance_set = true;
+                        break;
                 }
         }
+
+        if (instance_set) {
+                argc -= 2;
+                t_argv = &argv[2];
+        } else
+                t_argv = &argv[0];
 
         if ((argc < 3) || (argc > 5)) {
@@ -86 +100 @@
         }
         if (argc > 3)
-                dev = argv[3];
+                dev = t_argv[3];
         if (argc == 5)
-                mopts = argv[4];
+                mopts = t_argv[4];
 
-        rc = mount(argv[1], argv[2], dev, mopts, 0);
+        rc = mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",
-                    argv[1], argv[2], argv[3], rc);
+                    t_argv[1], t_argv[2], t_argv[3], rc);
                 return CMD_FAILURE;
         }

uspace/app/init/init.c

@@ -121 +121 @@
         
         int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
-            IPC_FLAG_BLOCKING);
+            IPC_FLAG_BLOCKING, 0);
         return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
             ROOT_DEVICE, rc);
@@ -138 +138 @@
 {
         int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
-            IPC_FLAG_BLOCKING);
+            IPC_FLAG_BLOCKING, 0);
         return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
             LOCFS_FS_TYPE, NULL, rc);
@@ -261 +261 @@
 static bool mount_tmpfs(void)
 {
-        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0);
+        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
         return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);
@@ -268 +268 @@
 static bool mount_data(void)
 {
-        int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0);
+        int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0, 0);
         return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE,
             DATA_DEVICE, rc);

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -130 +130 @@
 
         opResult = ddf_fun_bind(hub_fun);
-        assert(opResult == EOK);
-        opResult = ddf_fun_add_to_category(hub_fun, "hub");
         assert(opResult == EOK);
 

uspace/lib/c/arch/ia64/include/ddi.h

@@ -52 +52 @@
 static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
-        uintptr_t prt = (uintptr_t) port;
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
 
-        *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+                *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        } else {
+                *port = v;
+        }
 
         asm volatile ("mf\n" ::: "memory");
@@ -62 +66 @@
 static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
-        uintptr_t prt = (uintptr_t) port;
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
 
-        *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+                *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        } else {
+                *port = v;
+        }
 
         asm volatile ("mf\n" ::: "memory");
@@ -72 +80 @@
 static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
-        uintptr_t prt = (uintptr_t) port;
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
 
-        *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+                *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        } else {
+                *port = v;
+        }
 
         asm volatile ("mf\n" ::: "memory");
@@ -82 +94 @@
 static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        uintptr_t prt = (uintptr_t) port;
+        uint8_t v;
 
         asm volatile ("mf\n" ::: "memory");
 
-        return *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12))));
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+
+                v = *((ioport8_t *)(IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12))));
+        } else {
+                v = *port;
+        }
+
+        return v;
 }
 
 static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        uintptr_t prt = (uintptr_t) port;
+        uint16_t v;
 
         asm volatile ("mf\n" ::: "memory");
 
-        return *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12))));
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+
+                v = *((ioport16_t *)(IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12))));
+        } else {
+                v = *port;
+        }
+
+        return v;
 }
 
 static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        uintptr_t prt = (uintptr_t) port;
+        uint32_t v;
 
         asm volatile ("mf\n" ::: "memory");
 
-        return *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12))));
+        if (port < (ioport32_t *) port) {
+                uintptr_t prt = (uintptr_t) port;
+
+                v = *((ioport32_t *)(IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12))));
+        } else {
+                v = *port;
+        }
+
+        return v;
 }
 

uspace/lib/c/generic/adt/hash_table.c

@@ -190 +190 @@
 }
 
-/** Apply fucntion to all items in hash table.
+/** Apply function to all items in hash table.
  *
  * @param h   Hash table.

uspace/lib/c/generic/adt/list.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       Functions completing doubly linked circular list implementaion.
+ * @brief       Functions completing doubly linked circular list implementation.
  *
  * This file contains some of the functions implementing doubly linked circular lists.

uspace/lib/c/generic/malloc.c

@@ -873 +873 @@
 void free(const void *addr)
 {
+        if (addr == NULL)
+                return;
+
         futex_down(&malloc_futex);
         

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

@@ -143 +143 @@
 
 int mount(const char *fs_name, const char *mp, const char *fqsn,
-    const char *opts, unsigned int flags)
+    const char *opts, unsigned int flags, unsigned int instance)
 {
         int null_id = -1;
@@ -181 +181 @@
 
         sysarg_t rc_orig;
-        aid_t req = async_send_2(exch, VFS_IN_MOUNT, service_id, flags, NULL);
+        aid_t req = async_send_3(exch, VFS_IN_MOUNT, service_id, flags,
+            instance, NULL);
         sysarg_t rc = async_data_write_start(exch, (void *) mpa, mpa_size);
         if (rc != EOK) {

uspace/lib/c/include/ipc/vfs.h

@@ -56 +56 @@
         /** Unique identifier of the fs. */
         char name[FS_NAME_MAXLEN + 1];
+        unsigned int instance;
         bool concurrent_read_write;
         bool write_retains_size;

uspace/lib/c/include/vfs/vfs.h

@@ -49 +49 @@
 
 extern int mount(const char *, const char *, const char *, const char *,
-    unsigned int);
+    unsigned int, unsigned int);
 extern int unmount(const char *);
 

uspace/srv/devman/main.c

@@ -490 +490 @@
         if (rc == EOK) {
                 loc_service_add_to_cat(fun->service_id, cat_id);
+                log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
+                    fun->pathname, cat_name);
         } else {
                 log_msg(LVL_ERROR, "Failed adding function `%s' to category "
@@ -495 +497 @@
         }
         
-        log_msg(LVL_NOTE, "Function `%s' added to category `%s'.",
-            fun->pathname, cat_name);
-
         fibril_rwlock_read_unlock(&device_tree.rwlock);
         fun_del_ref(fun);
-
-        async_answer_0(callid, EOK);
+        
+        async_answer_0(callid, rc);
 }
 

uspace/srv/fs/cdfs/cdfs.c

@@ -52 +52 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -58 +59 @@
         printf("%s: HelenOS cdfs file system server\n", NAME);
         
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        cdfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
+
         if (!cdfs_init()) {
                 printf("%s: failed to initialize cdfs\n", NAME);

uspace/srv/fs/exfat/exfat.c

@@ -54 +54 @@
         .name = NAME,
         .concurrent_read_write = false,
-        .write_retains_size = false,    
+        .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -60 +61 @@
 {
         printf(NAME ": HelenOS exFAT file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        exfat_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
 
         int rc = exfat_idx_init();

uspace/srv/fs/ext2fs/ext2fs.c

@@ -52 +52 @@
 vfs_info_t ext2fs_vfs_info = {
         .name = NAME,
+        .instance = 0,
 };
 
@@ -57 +58 @@
 {
         printf(NAME ": HelenOS EXT2 file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        ext2fs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
         
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,

uspace/srv/fs/fat/fat.c

@@ -54 +54 @@
         .name = NAME,
         .concurrent_read_write = false,
-        .write_retains_size = false,    
+        .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -61 +62 @@
         printf(NAME ": HelenOS FAT file system server\n");
         
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        fat_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
+
         int rc = fat_idx_init();
         if (rc != EOK)

uspace/srv/fs/locfs/locfs.c

@@ -55 +55 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -61 +62 @@
         printf("%s: HelenOS Device Filesystem\n", NAME);
         
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        locfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
+
+
         if (!locfs_init()) {
                 printf("%s: failed to initialize locfs\n", NAME);

uspace/srv/fs/mfs/mfs.c

@@ -39 +39 @@
 
 #include <ipc/services.h>
+#include <stdlib.h>
+#include <str.h>
 #include <ns.h>
 #include <async.h>
@@ -52 +54 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -59 +62 @@
 
         printf(NAME ": HelenOS Minix file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        mfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        rc = -1;
+                        goto err;
+                }
+        }
 
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,

uspace/srv/fs/tmpfs/tmpfs.c

@@ -59 +59 @@
         .concurrent_read_write = false,
         .write_retains_size = false,
+        .instance = 0,
 };
 
@@ -64 +65 @@
 {
         printf(NAME ": HelenOS TMPFS file system server\n");
+
+        if (argc == 3) {
+                if (!str_cmp(argv[1], "--instance"))
+                        tmpfs_vfs_info.instance = strtol(argv[2], NULL, 10);
+                else {
+                        printf(NAME " Unrecognized parameters");
+                        return -1;
+                }
+        }
         
         if (!tmpfs_init()) {

uspace/srv/vfs/vfs.h

@@ -171 +171 @@
 extern void vfs_exchange_release(async_exch_t *);
 
-extern fs_handle_t fs_name_to_handle(char *, bool);
+extern fs_handle_t fs_name_to_handle(unsigned int instance, char *, bool);
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
 

uspace/srv/vfs/vfs_ops.c

@@ -146 +146 @@
 
                         rindex = (fs_index_t) IPC_GET_ARG1(answer);
-                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer), IPC_GET_ARG3(answer));
+                        rsize = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
+                            IPC_GET_ARG3(answer));
                         rlnkcnt = (unsigned) IPC_GET_ARG4(answer);
                         
@@ -276 +277 @@
         
         /*
-         * For now, don't make use of ARG3, but it can be used to
-         * carry mount options in the future.
-         */
-        
+         * Instance number is passed as ARG3.
+         */
+        unsigned int instance = IPC_GET_ARG3(*request);
+
         /* We want the client to send us the mount point. */
         char *mp;
@@ -335 +336 @@
         fs_handle_t fs_handle;
 recheck:
-        fs_handle = fs_name_to_handle(fs_name, false);
+        fs_handle = fs_name_to_handle(instance, fs_name, false);
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {

uspace/srv/vfs/vfs_register.c

@@ -154 +154 @@
          * Check for duplicit registrations.
          */
-        if (fs_name_to_handle(fs_info->vfs_info.name, false)) {
+        if (fs_name_to_handle(fs_info->vfs_info.instance,
+            fs_info->vfs_info.name, false)) {
                 /*
                  * We already register a fs like this.
@@ -297 +298 @@
  *
  */
-fs_handle_t fs_name_to_handle(char *name, bool lock)
+fs_handle_t fs_name_to_handle(unsigned int instance, char *name, bool lock)
 {
         int handle = 0;
@@ -306 +307 @@
         list_foreach(fs_list, cur) {
                 fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-                if (str_cmp(fs->vfs_info.name, name) == 0) {
+                if (str_cmp(fs->vfs_info.name, name) == 0 &&
+                    instance == fs->vfs_info.instance) {
                         handle = fs->fs_handle;
                         break;