Changeset 973ef9fc in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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.

File:

• uspace/srv/vfs/vfs_register.c (modified) (4 diffs)

uspace/srv/vfs/vfs_register.c

@@ -177 +177 @@
         ipc_call_t call;
         ipc_callid_t callid = async_get_call(&call);
-        if (IPC_GET_METHOD(call) != IPC_M_CONNECT_TO_ME) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
+        if (IPC_GET_IMETHOD(call) != IPC_M_CONNECT_TO_ME) {
+                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
@@ -197 +197 @@
         size_t size;
         if (!async_share_in_receive(&callid, &size)) {
-                dprintf("Unexpected call, method = %d\n", IPC_GET_METHOD(call));
+                dprintf("Unexpected call, method = %d\n", IPC_GET_IMETHOD(call));
                 list_remove(&fs_info->fs_link);
                 fibril_mutex_unlock(&fs_head_lock);
@@ -235 +235 @@
          */
         fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-        ipc_answer_1(rid, EOK, (ipcarg_t) fs_info->fs_handle);
+        ipc_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
         
         fibril_condvar_broadcast(&fs_head_cv);
@@ -333 +333 @@
 }
 
+/** Find the VFS info structure.
+ *
+ * @param handle        FS handle for which the VFS info structure is sought.
+ * @return              VFS info structure on success or NULL otherwise.
+ */
+vfs_info_t *fs_handle_to_info(fs_handle_t handle)
+{
+        vfs_info_t *info = NULL;
+        link_t *cur;
+
+        fibril_mutex_lock(&fs_head_lock);
+        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 (fs->fs_handle == handle) { 
+                        info = &fs->vfs_info;
+                        break;
+                }
+        }
+        fibril_mutex_unlock(&fs_head_lock);
+
+        return info;
+}
+
 /**
  * @}