Changeset fb7e5a9a in mainline for uspace/srv/fs/locfs/locfs_ops.c

Timestamp:

2011-09-06T20:03:31Z (13 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/locfs/locfs_ops.c (modified) (2 diffs)

uspace/srv/fs/locfs/locfs_ops.c

@@ -418 +418 @@
 }
 
-static service_id_t locfs_device_get(fs_node_t *fn)
+static service_id_t locfs_service_get(fs_node_t *fn)
 {
         locfs_node_t *node = (locfs_node_t *) fn->data;
@@ -445 +445 @@
         .is_directory = locfs_is_directory,
         .is_file = locfs_is_file,
-        .device_get = locfs_device_get
+        .service_get = locfs_service_get
 };