Changeset 925a21e in mainline for uspace/lib/ext2/libext2_filesystem.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/lib/ext2/libext2_filesystem.c (modified) (3 diffs)

uspace/lib/ext2/libext2_filesystem.c

@@ -50 +50 @@
  * 
  * @param fs                    Pointer to ext2_filesystem_t to initialize
- * @param devmap_handle Device handle of the block device
- * 
- * @return              EOK on success or negative error code on failure
- */
-int ext2_filesystem_init(ext2_filesystem_t *fs, devmap_handle_t devmap_handle)
+ * @param service_id    Service ID of the block device
+ * 
+ * @return              EOK on success or negative error code on failure
+ */
+int ext2_filesystem_init(ext2_filesystem_t *fs, service_id_t service_id)
 {
         int rc;
@@ -60 +60 @@
         size_t block_size;
         
-        fs->device = devmap_handle;
+        fs->device = service_id;
         
         rc = block_init(EXCHANGE_SERIALIZE, fs->device, 2048);
@@ -80 +80 @@
         }
         
-        rc = block_cache_init(devmap_handle, block_size, 0, CACHE_MODE_WT);
+        rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WT);
         if (rc != EOK) {
                 block_fini(fs->device);