Changeset 26e7d6d in mainline for uspace/lib/ext2/libext2_superblock.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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_superblock.c (modified) (2 diffs)

uspace/lib/ext2/libext2_superblock.c

@@ -321 +321 @@
 /** Read a superblock directly from device (i.e. no libblock cache)
  * 
- * @param devmap_handle Device handle of the block device.
+ * @param service_id    Service ID of the block device.
  * @param superblock    Pointer where to store pointer to new superblock
  * 
  * @return              EOK on success or negative error code on failure.
  */
-int ext2_superblock_read_direct(devmap_handle_t devmap_handle,
+int ext2_superblock_read_direct(service_id_t service_id,
     ext2_superblock_t **superblock)
 {
@@ -337 +337 @@
         }
         
-        rc = block_read_bytes_direct(devmap_handle, EXT2_SUPERBLOCK_OFFSET,
+        rc = block_read_bytes_direct(service_id, EXT2_SUPERBLOCK_OFFSET,
             EXT2_SUPERBLOCK_SIZE, data);
         if (rc != EOK) {