Changeset 84b86dcb in mainline

Timestamp:

2007-09-28T13:42:04Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

12a56fa

Parents:

13125d3

Message:

VFS work.
Add fs_name_to_handle() function to abstract away the details of walking the
list of registered file systems, and in order to avoid code duplication.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_register.c (modified) (4 diffs)

uspace/srv/vfs/vfs.h

@@ -148 +148 @@
 extern void vfs_release_phone(int);
 
+extern int fs_name_to_handle(char *name, bool lock);
+
 extern int vfs_lookup_internal(char *path, size_t len, vfs_node_t *result);
 

uspace/srv/vfs/vfs_register.c

@@ -219 +219 @@
          * Check for duplicit registrations.
          */
-        link_t *cur;
-        for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
-                fs_info_t *fi = list_get_instance(cur, fs_info_t,
-                    fs_link);
-                /* TODO: replace strcmp with strncmp once we have it */
-                if (strcmp(fs_info->vfs_info.name, fi->vfs_info.name) == 0) {
-                        /*
-                         * We already register a fs like this.
-                         */
-                        dprintf("FS is already registered.\n");
-                        futex_up(&fs_head_futex);
-                        free(fs_info);
-                        ipc_answer_fast(callid, EEXISTS, 0, 0);
-                        ipc_answer_fast(rid, EEXISTS, 0, 0);
-                        return;
-                }
+        if (fs_name_to_handle(fs_info->vfs_info.name, false)) {
+                /*
+                 * We already register a fs like this.
+                 */
+                dprintf("FS is already registered.\n");
+                futex_up(&fs_head_futex);
+                free(fs_info);
+                ipc_answer_fast(callid, EEXISTS, 0, 0);
+                ipc_answer_fast(rid, EEXISTS, 0, 0);
+                return;
         }
 
@@ -307 +301 @@
         dprintf("Sharing PLB.\n");
 
-        futex_up(&fs_head_futex);
-
         /*
          * That was it. The FS has been registered.
@@ -316 +308 @@
         fs_info->fs_handle = (int) atomic_postinc(&fs_handle_next);
         ipc_answer_fast(rid, EOK, (ipcarg_t) fs_info->fs_handle, 0);
+        
+        futex_up(&fs_head_futex);
+        
         dprintf("\"%s\" filesystem successfully registered, handle=%d.\n",
             fs_info->vfs_info.name, fs_info->fs_handle);
@@ -385 +380 @@
 }
 
+/** Convert file system name to its handle.
+ *
+ * @param name          File system name.
+ * @param lock          If true, the function will down and up the
+ *                      fs_head_futex.
+ *
+ * @return              File system handle or zero if file system not found.
+ */
+int fs_name_to_handle(char *name, bool lock)
+{
+        int handle = 0;
+        
+        if (lock)
+                futex_down(&fs_head_futex);
+        link_t *cur;
+        for (cur = fs_head.next; cur != &fs_head; cur = cur->next) {
+                fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
+                if (strcmp(fs->vfs_info.name, name) == 0) { /* XXX: strncmp() */
+                        handle = fs->fs_handle;
+                        break;
+                }
+        }
+        if (lock)
+                futex_up(&fs_head_futex);
+        return handle;
+}
+
 /**
  * @}