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

Changeset db6e419 in mainline for uspace/app/ext2info/ext2info.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/app/ext2info/ext2info.c

    re0e922d rdb6e419  
    4242#include <libblock.h>
    4343#include <mem.h>
    44 #include <devmap.h>
     44#include <loc.h>
    4545#include <byteorder.h>
    4646#include <sys/types.h>
     
    8181        char *endptr;
    8282        char *dev_path;
    83         devmap_handle_t handle;
     83        service_id_t service_id;
    8484        ext2_filesystem_t filesystem;
    8585        int arg_flags;
     
    178178        dev_path = *argv;
    179179
    180         rc = devmap_device_get_handle(dev_path, &handle, 0);
     180        rc = loc_service_get_id(dev_path, &service_id, 0);
    181181        if (rc != EOK) {
    182182                printf(NAME ": Error resolving device `%s'.\n", dev_path);
     
    184184        }
    185185
    186         rc = ext2_filesystem_init(&filesystem, handle);
     186        rc = ext2_filesystem_init(&filesystem, service_id);
    187187        if (rc != EOK)  {
    188188                printf(NAME ": Error initializing libext2.\n");
Note: See TracChangeset for help on using the changeset viewer.