Changes in uspace/srv/vfs/vfs.h [f29a3a2:991f645] in mainline

File:

• uspace/srv/vfs/vfs.h (modified) (9 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
 
 /**
@@ -63 +62 @@
 #define VFS_PAIR \
         fs_handle_t fs_handle; \
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 
 /**
@@ -69 +68 @@
  * doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
- * @note        fs_handle, dev_handle and index are meant to be returned in one
+ * @note        fs_handle, devmap_handle and index are meant to be returned in one
  *              IPC reply.
  */
@@ -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;
 
@@ -170 +169 @@
 
 extern int vfs_grab_phone(fs_handle_t);
-extern void vfs_release_phone(int);
+extern void vfs_release_phone(fs_handle_t, int);
 
 extern fs_handle_t fs_name_to_handle(char *, bool);
@@ -183 +182 @@
 extern void vfs_node_put(vfs_node_t *);
 extern void vfs_node_forget(vfs_node_t *);
-extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, dev_handle_t);
+extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, devmap_handle_t);
 
 
@@ -214 +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 *);