Changeset 677745a in mainline for uspace/srv/vfs

Timestamp:

2013-07-29T12:54:39Z (12 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.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (2 diffs)
• vfs_lookup.c (modified) (2 diffs)
• vfs_node.c (modified) (2 diffs)
• vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -113 +113 @@
         vfs_node_type_t type;   /**< Partial info about the node type. */
 
-        aoff64_t size;          /**< Cached size if the node is a file. */
+        int64_t size;           /**< Cached size if the node is a file. */
 
         /**
@@ -185 +185 @@
 extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, service_id_t);
 
+int64_t vfs_node_get_size(vfs_node_t *node);
 
 #define MAX_OPEN_FILES  128

uspace/srv/vfs/vfs_lookup.c

@@ -270 +270 @@
         }
         
+        unsigned last = IPC_GET_ARG3(answer);
+        if (last != first + len) {
+                /* The path wasn't processed entirely. */
+                rc = ENOENT;
+                goto out;
+        }
+        
         if (!result) {
                 rc = EOK;
@@ -278 +285 @@
         result->triplet.service_id = (service_id_t) IPC_GET_ARG1(answer);
         result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
-        result->size =
-            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(answer), IPC_GET_ARG4(answer));
+        result->size = (int64_t)(int32_t) IPC_GET_ARG4(answer);
         result->type = IPC_GET_ARG5(answer);
         rc = EOK;

uspace/srv/vfs/vfs_node.c

@@ -45 +45 @@
 #include <async.h>
 #include <errno.h>
+#include <macros.h>
 
 /** Mutex protecting the VFS node hash table. */
@@ -300 +301 @@
 }
 
+int64_t vfs_node_get_size(vfs_node_t *node)
+{
+        if (node->size == -1) {
+                sysarg_t sz1 = 0;
+                sysarg_t sz2 = 0;
+                
+                async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+                (void) async_req_2_2(exch, VFS_OUT_GET_SIZE,
+                        node->service_id, node->index, &sz1, &sz2);
+                vfs_exchange_release(exch);
+                
+                node->size = MERGE_LOUP32(sz1, sz2);
+        }
+        return node->size;
+}
+
 /**
  * @}

uspace/srv/vfs/vfs_ops.c

@@ -840 +840 @@
         } else {
                 if (file->append)
-                        file->pos = file->node->size;
+                        file->pos = vfs_node_get_size(file->node);
                 
                 rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE,
@@ -942 +942 @@
         case SEEK_END:
                 fibril_rwlock_read_lock(&file->node->contents_rwlock);
-                aoff64_t size = file->node->size;
+                aoff64_t size = vfs_node_get_size(file->node);
                 
                 if ((off >= 0) && (size + off < size)) {