Changeset 0b9ac3c in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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.h (modified) (7 diffs)

uspace/srv/vfs/vfs.h

@@ -42 +42 @@
 #include <ipc/vfs.h>
 
-// FIXME: according to CONFIG_DEBUG
-// #define dprintf(...)  printf(__VA_ARGS__)
-
-#define dprintf(...)
+#ifndef dprintf
+        #define dprintf(...)
+#endif
 
 /**
@@ -93 +92 @@
         vfs_triplet_t triplet;
         vfs_node_type_t type;
-        size_t size;
-        unsigned lnkcnt;
+        aoff64_t size;
+        unsigned int lnkcnt;
 } vfs_lookup_res_t;
 
@@ -117 +116 @@
         vfs_node_type_t type;   /**< Partial info about the node type. */
 
-        size_t size;            /**< Cached size if the node is a file. */
+        aoff64_t size;          /**< Cached size if the node is a file. */
 
         /**
@@ -141 +140 @@
         bool append;
 
-        /** Current position in the file. */
-        off_t pos;
+        /** Current absolute position in the file. */
+        aoff64_t pos;
 } vfs_file_t;
 
@@ -177 +176 @@
     vfs_pair_t *, ...);
 extern int vfs_open_node_internal(vfs_lookup_res_t *);
+extern int vfs_close_internal(vfs_file_t *);
 
 extern bool vfs_nodes_init(void);
@@ -188 +188 @@
 
 extern bool vfs_files_init(void);
+extern void vfs_files_done(void);
 extern vfs_file_t *vfs_file_get(int);
 extern int vfs_fd_assign(vfs_file_t *file, int fd);
@@ -212 +213 @@
 extern void vfs_truncate(ipc_callid_t, ipc_call_t *);
 extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
-extern void vfs_fstat(ipc_callid_t, ipc_call_t *);
 extern void vfs_stat(ipc_callid_t, ipc_call_t *);
 extern void vfs_mkdir(ipc_callid_t, ipc_call_t *);