Changeset 5eb5dcf in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2010-01-06T20:56:04Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fccc236

Parents:

002252a (diff), eca2435 (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/fs/fat/fat_ops.c (modified) (7 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -52 +52 @@
 #include <adt/list.h>
 #include <assert.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <sys/mman.h>
 #include <align.h>
@@ -71 +71 @@
 static int fat_match(fs_node_t **, fs_node_t *, const char *);
 static int fat_node_get(fs_node_t **, dev_handle_t, fs_index_t);
+static int fat_node_open(fs_node_t *);
 static int fat_node_put(fs_node_t *);
 static int fat_create_node(fs_node_t **, dev_handle_t, int);
@@ -83 +84 @@
 static bool fat_is_directory(fs_node_t *);
 static bool fat_is_file(fs_node_t *node);
+static dev_handle_t fat_device_get(fs_node_t *node);
 
 /*
@@ -407 +409 @@
 }
 
+int fat_node_open(fs_node_t *fn)
+{
+        /*
+         * Opening a file is stateless, nothing
+         * to be done here.
+         */
+        return EOK;
+}
+
 int fat_node_put(fs_node_t *fn)
 {
@@ -867 +878 @@
 }
 
+dev_handle_t fat_device_get(fs_node_t *node)
+{
+        return 0;
+}
+
 /** libfs operations */
 libfs_ops_t fat_libfs_ops = {
@@ -872 +888 @@
         .match = fat_match,
         .node_get = fat_node_get,
+        .node_open = fat_node_open,
         .node_put = fat_node_put,
         .create = fat_create_node,
@@ -881 +898 @@
         .size_get = fat_size_get,
         .lnkcnt_get = fat_lnkcnt_get,
-        .plb_get_char = fat_plb_get_char,
+        .plb_get_char = fat_plb_get_char,
         .is_directory = fat_is_directory,
-        .is_file = fat_is_file
+        .is_file = fat_is_file,
+        .device_get = fat_device_get
 };