Changeset 677745a in mainline for uspace/lib/fs/libfs.c

Timestamp:

2013-07-29T12:54:39Z (11 years ago)

Author:

Jiri Zarevucky <zarevucky.jiri@…>

Branches:

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

Children:

5bcd5b7

Parents:

b7c62a9

Message:

Have lookup return the last found directory, and the portion of path traversed. In exchange, only size < 2GB is returned from lookup.

File:

• uspace/lib/fs/libfs.c (modified) (7 diffs)

uspace/lib/fs/libfs.c

@@ -238 +238 @@
 }
 
+static void vfs_out_get_size(ipc_callid_t rid, ipc_call_t *req)
+{
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
+        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+        int rc;
+
+        fs_node_t *node = NULL;
+        rc = libfs_ops->node_get(&node, service_id, index);
+        if (rc != EOK) {
+                async_answer_0(rid, rc);
+        }
+        if (node == NULL) {
+                async_answer_0(rid, EINVAL);
+        }
+        
+        uint64_t size = libfs_ops->size_get(node);
+        libfs_ops->node_put(node);
+        
+        async_answer_2(rid, EOK, LOWER32(size), UPPER32(size));
+}
+
 static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -299 +320 @@
                         vfs_out_sync(callid, &call);
                         break;
+                case VFS_OUT_GET_SIZE:
+                        vfs_out_get_size(callid, &call);
+                        break;
                 default:
                         async_answer_0(callid, ENOTSUP);
@@ -657 +681 @@
         /* Find the file and its parent. */
         
+        unsigned last_next = 0;
+        
         while (next != last) {
                 if (cur == NULL) {
-                        async_answer_0(rid, ENOENT);
-                        LOG_EXIT(ENOENT);
-                        goto out;
-                }
+                        assert(par != NULL);
+                        goto out1;
+                }
+
                 if (!ops->is_directory(cur)) {
                         async_answer_0(rid, ENOTDIR);
@@ -669 +695 @@
                 }
                 
+                last_next = next;
                 /* Collect the component */
                 rc = plb_get_component(component, &clen, &next, last);
@@ -773 +800 @@
                 rc = ops->unlink(par, cur, component);
                 if (rc == EOK) {
-                        aoff64_t size = ops->size_get(cur);
+                        int64_t size = ops->size_get(cur);
+                        int32_t lsize = LOWER32(size);
+                        if (lsize != size) {
+                                lsize = -1;
+                        }
+                        
                         async_answer_5(rid, fs_handle, service_id,
-                            ops->index_get(cur), LOWER32(size), UPPER32(size),
+                            ops->index_get(cur), last, lsize,
                             ops->is_directory(cur) ? VFS_NODE_DIRECTORY : VFS_NODE_FILE);
                         LOG_EXIT(EOK);
@@ -819 +851 @@
         
         /* Return. */
-        
+out1:
         if (!cur) {
+                async_answer_5(rid, fs_handle, service_id,
+                        ops->index_get(par), last_next, -1, VFS_NODE_DIRECTORY);
+                LOG_EXIT(EOK);
+                /*
                 async_answer_0(rid, ENOENT);
                 LOG_EXIT(ENOENT);
+                */
                 goto out;
         }
@@ -835 +872 @@
         }
         
-        aoff64_t size = ops->size_get(cur);
+        int64_t size = ops->size_get(cur);
+        int32_t lsize = LOWER32(size);
+        if (lsize != size) {
+                lsize = -1;
+        }
+        
         async_answer_5(rid, fs_handle, service_id,
-                ops->index_get(cur), LOWER32(size), UPPER32(size),
+                ops->index_get(cur), last, lsize,
                 ops->is_directory(cur) ? VFS_NODE_DIRECTORY : VFS_NODE_FILE);