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

Changeset db6e419 in mainline for uspace/lib/ext2/libext2_filesystem.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_filesystem.c

    re0e922d rdb6e419  
    5050 *
    5151 * @param fs                    Pointer to ext2_filesystem_t to initialize
    52  * @param devmap_handle Device handle of the block device
    53  *
    54  * @return              EOK on success or negative error code on failure
    55  */
    56 int ext2_filesystem_init(ext2_filesystem_t *fs, devmap_handle_t devmap_handle)
     52 * @param service_id    Service ID of the block device
     53 *
     54 * @return              EOK on success or negative error code on failure
     55 */
     56int ext2_filesystem_init(ext2_filesystem_t *fs, service_id_t service_id)
    5757{
    5858        int rc;
     
    6060        size_t block_size;
    6161       
    62         fs->device = devmap_handle;
     62        fs->device = service_id;
    6363       
    6464        rc = block_init(EXCHANGE_SERIALIZE, fs->device, 2048);
     
    8080        }
    8181       
    82         rc = block_cache_init(devmap_handle, block_size, 0, CACHE_MODE_WT);
     82        rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WT);
    8383        if (rc != EOK) {
    8484                block_fini(fs->device);
Note: See TracChangeset for help on using the changeset viewer.