Changeset 7bdcc45 in mainline for uspace/lib/fs

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/lib/fs

Files:

• libfs.c (modified) (2 diffs)
• libfs.h (modified) (1 diff)

uspace/lib/fs/libfs.c

@@ -155 +155 @@
         devmap_handle_t mr_devmap_handle = (devmap_handle_t) IPC_GET_ARG4(*request);
         int res;
-        ipcarg_t rc;
+        sysarg_t rc;
         
         ipc_call_t call;
@@ -163 +163 @@
         callid = async_get_call(&call);
         int mountee_phone = (int) IPC_GET_ARG1(call);
-        if ((IPC_GET_METHOD(call) != IPC_M_CONNECTION_CLONE) ||
+        if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECTION_CLONE) ||
             (mountee_phone < 0)) {
                 ipc_answer_0(callid, EINVAL);

uspace/lib/fs/libfs.h

@@ -86 +86 @@
 typedef struct {
         int fs_handle;           /**< File system handle. */
-        ipcarg_t vfs_phonehash;  /**< Initial VFS phonehash. */
+        sysarg_t vfs_phonehash;  /**< Initial VFS phonehash. */
         uint8_t *plb_ro;         /**< Read-only PLB view. */
 } fs_reg_t;