Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset db6e419 in mainline for uspace/lib/ext2/libext2_superblock.c


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/ext2/libext2_superblock.c

    re0e922d rdb6e419  
    321321/** Read a superblock directly from device (i.e. no libblock cache)
    322322 *
    323  * @param devmap_handle Device handle of the block device.
     323 * @param service_id    Service ID of the block device.
    324324 * @param superblock    Pointer where to store pointer to new superblock
    325325 *
    326326 * @return              EOK on success or negative error code on failure.
    327327 */
    328 int ext2_superblock_read_direct(devmap_handle_t devmap_handle,
     328int ext2_superblock_read_direct(service_id_t service_id,
    329329    ext2_superblock_t **superblock)
    330330{
     
    337337        }
    338338       
    339         rc = block_read_bytes_direct(devmap_handle, EXT2_SUPERBLOCK_OFFSET,
     339        rc = block_read_bytes_direct(service_id, EXT2_SUPERBLOCK_OFFSET,
    340340            EXT2_SUPERBLOCK_SIZE, data);
    341341        if (rc != EOK) {
Note: See TracChangeset for help on using the changeset viewer.