Changeset 4f5dc18 in mainline for uspace/lib/libfs/libfs.c

Timestamp:

2009-11-03T21:36:54Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

• uspace/lib/libfs/libfs.c (modified) (6 diffs)

uspace/lib/libfs/libfs.c

@@ -91 +91 @@
          * Send our VFS info structure to VFS.
          */
-        int rc = ipc_data_write_start(vfs_phone, info, sizeof(*info)); 
+        int rc = async_data_write_start(vfs_phone, info, sizeof(*info)); 
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -114 +114 @@
          * Request sharing the Path Lookup Buffer with VFS.
          */
-        rc = ipc_share_in_start_0_0(vfs_phone, reg->plb_ro, PLB_SIZE);
+        rc = async_share_in_start_0_0(vfs_phone, reg->plb_ro, PLB_SIZE);
         if (rc) {
                 async_wait_for(req, NULL);
@@ -169 +169 @@
         ipc_answer_0(callid, EOK);      /* acknowledge the mountee_phone */
         
-        res = ipc_data_write_receive(&callid, NULL);
+        res = async_data_write_receive(&callid, NULL);
         if (!res) {
                 ipc_hangup(mountee_phone);
@@ -486 +486 @@
         ipc_callid_t callid;
         size_t size;
-        if (!ipc_data_read_receive(&callid, &size) ||
+        if (!async_data_read_receive(&callid, &size) ||
             size != sizeof(struct stat)) {
                 ipc_answer_0(callid, EINVAL);
@@ -503 +503 @@
         stat.size = ops->size_get(fn);
 
-        ipc_data_read_finalize(callid, &stat, sizeof(struct stat));
+        async_data_read_finalize(callid, &stat, sizeof(struct stat));
         ipc_answer_0(rid, EOK);
 }
@@ -531 +531 @@
         }
         
-        ipc_answer_5(rid, EOK, fs_handle, dev_handle, index, ops->size_get(fn),
-            ops->lnkcnt_get(fn));
+        ipc_answer_3(rid, EOK, ops->size_get(fn), ops->lnkcnt_get(fn),
+            (ops->is_file(fn) ? L_FILE : 0) | (ops->is_directory(fn) ? L_DIRECTORY : 0));
         
         (void) ops->node_put(fn);