Changeset fb7e5a9a in mainline for uspace/srv/fs/ext2fs/ext2fs_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/ext2fs/ext2fs_ops.c (modified) (3 diffs)

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -112 +112 @@
 static bool ext2fs_is_directory(fs_node_t *);
 static bool ext2fs_is_file(fs_node_t *node);
-static service_id_t ext2fs_device_get(fs_node_t *node);
+static service_id_t ext2fs_service_get(fs_node_t *node);
 
 /*
@@ -557 +557 @@
 }
 
-service_id_t ext2fs_device_get(fs_node_t *fn)
+service_id_t ext2fs_service_get(fs_node_t *fn)
 {
         EXT2FS_DBG("");
@@ -581 +581 @@
         .is_directory = ext2fs_is_directory,
         .is_file = ext2fs_is_file,
-        .device_get = ext2fs_device_get
+        .service_get = ext2fs_service_get
 };