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

Changeset db6e419 in mainline for uspace/lib/fs/libfs.h


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/fs/libfs.h

    re0e922d rdb6e419  
    4040#include <stdint.h>
    4141#include <async.h>
    42 #include <devmap.h>
     42#include <loc.h>
    4343
    4444typedef struct {
    45         int (* mounted)(devmap_handle_t, const char *, fs_index_t *, aoff64_t *,
     45        int (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *,
    4646            unsigned *);
    47         int (* unmounted)(devmap_handle_t);
    48         int (* read)(devmap_handle_t, fs_index_t, aoff64_t, size_t *);
    49         int (* write)(devmap_handle_t, fs_index_t, aoff64_t, size_t *,
     47        int (* unmounted)(service_id_t);
     48        int (* read)(service_id_t, fs_index_t, aoff64_t, size_t *);
     49        int (* write)(service_id_t, fs_index_t, aoff64_t, size_t *,
    5050            aoff64_t *);
    51         int (* truncate)(devmap_handle_t, fs_index_t, aoff64_t);
    52         int (* close)(devmap_handle_t, fs_index_t);
    53         int (* destroy)(devmap_handle_t, fs_index_t);
    54         int (* sync)(devmap_handle_t, fs_index_t);
     51        int (* truncate)(service_id_t, fs_index_t, aoff64_t);
     52        int (* close)(service_id_t, fs_index_t);
     53        int (* destroy)(service_id_t, fs_index_t);
     54        int (* sync)(service_id_t, fs_index_t);
    5555} vfs_out_ops_t;
    5656
     
    5959        async_sess_t *sess;
    6060        fs_handle_t fs_handle;
    61         devmap_handle_t devmap_handle;
     61        service_id_t service_id;
    6262} mp_data_t;
    6363
     
    7373         * argument holds the output argument.
    7474         */
    75         int (* root_get)(fs_node_t **, devmap_handle_t);
     75        int (* root_get)(fs_node_t **, service_id_t);
    7676        int (* match)(fs_node_t **, fs_node_t *, const char *);
    77         int (* node_get)(fs_node_t **, devmap_handle_t, fs_index_t);
     77        int (* node_get)(fs_node_t **, service_id_t, fs_index_t);
    7878        int (* node_open)(fs_node_t *);
    7979        int (* node_put)(fs_node_t *);
    80         int (* create)(fs_node_t **, devmap_handle_t, int);
     80        int (* create)(fs_node_t **, service_id_t, int);
    8181        int (* destroy)(fs_node_t *);
    8282        int (* link)(fs_node_t *, fs_node_t *, const char *);
     
    9292        bool (* is_directory)(fs_node_t *);
    9393        bool (* is_file)(fs_node_t *);
    94         devmap_handle_t (* device_get)(fs_node_t *);
     94        service_id_t (* device_get)(fs_node_t *);
    9595} libfs_ops_t;
    9696
Note: See TracChangeset for help on using the changeset viewer.