Changeset fb7e5a9a in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2011-09-06T20:03:31Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

038b289, f7d6b30

Parents:

7a46bfe (diff), 7e9fce6 (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/mfs/mfs_ops.c (modified) (3 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -55 +55 @@
 static int mfs_has_children(bool *has_children, fs_node_t *fsnode);
 static int mfs_root_get(fs_node_t **rfn, service_id_t service_id);
-static service_id_t mfs_device_get(fs_node_t *fsnode);
+static service_id_t mfs_service_get(fs_node_t *fsnode);
 static aoff64_t mfs_size_get(fs_node_t *node);
 static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);
@@ -81 +81 @@
         .size_get = mfs_size_get,
         .root_get = mfs_root_get,
-        .device_get = mfs_device_get,
+        .service_get = mfs_service_get,
         .is_directory = mfs_is_directory,
         .is_file = mfs_is_file,
@@ -325 +325 @@
 }
 
-service_id_t mfs_device_get(fs_node_t *fsnode)
+service_id_t mfs_service_get(fs_node_t *fsnode)
 {
         struct mfs_node *node = fsnode->data;