Changeset eb522e8 in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/srv/vfs/vfs.h (modified) (6 diffs)

uspace/srv/vfs/vfs.h

@@ -34 +34 @@
 #define VFS_VFS_H_
 
-#include <ipc/ipc.h>
+#include <async.h>
 #include <adt/list.h>
 #include <fibril_synch.h>
@@ -53 +53 @@
         vfs_info_t vfs_info;
         fs_handle_t fs_handle;
-        fibril_mutex_t phone_lock;
-        ipcarg_t phone;
+        async_sess_t session;
 } fs_info_t;
 
@@ -62 +61 @@
 #define VFS_PAIR \
         fs_handle_t fs_handle; \
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 
 /**
@@ -68 +67 @@
  * 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.
  */
@@ -172 +171 @@
 
 extern fs_handle_t fs_name_to_handle(char *, bool);
+extern vfs_info_t *fs_handle_to_info(fs_handle_t);
 
 extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *,
@@ -182 +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);
 
 
 #define MAX_OPEN_FILES  128
 
-extern bool vfs_files_init(void);
-extern void vfs_files_done(void);
+extern void *vfs_client_data_create(void);
+extern void vfs_client_data_destroy(void *);
+
 extern vfs_file_t *vfs_file_get(int);
-extern int vfs_fd_assign(vfs_file_t *file, int fd);
+extern void vfs_file_put(vfs_file_t *);
+extern int vfs_fd_assign(vfs_file_t *, int);
 extern int vfs_fd_alloc(bool desc);
 extern int vfs_fd_free(int);
-
-extern void vfs_file_addref(vfs_file_t *);
-extern void vfs_file_delref(vfs_file_t *);
 
 extern void vfs_node_addref(vfs_node_t *);