Changeset fb7e5a9a in mainline for uspace/srv/fs


Ignore:
Timestamp:
2011-09-06T20:03:31Z (14 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
038b289, f7d6b30
Parents:
7a46bfe (diff), 7e9fce6 (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

Location:
uspace/srv/fs
Files:
6 added
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/fs/exfat/exfat_ops.c

    r7a46bfe rfb7e5a9a  
    8787static bool exfat_is_directory(fs_node_t *);
    8888static bool exfat_is_file(fs_node_t *node);
    89 static service_id_t exfat_device_get(fs_node_t *node);
     89static service_id_t exfat_service_get(fs_node_t *node);
    9090
    9191/*
    … …  
    898898}
    899899
    900 service_id_t exfat_device_get(fs_node_t *node)
     900service_id_t exfat_service_get(fs_node_t *node)
    901901{
    902902        return 0;
    … …  
    921921        .is_directory = exfat_is_directory,
    922922        .is_file = exfat_is_file,
    923         .device_get = exfat_device_get
     923        .service_get = exfat_service_get
    924924};
    925925

  • uspace/srv/fs/ext2fs/ext2fs_ops.c

    r7a46bfe rfb7e5a9a  
    112112static bool ext2fs_is_directory(fs_node_t *);
    113113static bool ext2fs_is_file(fs_node_t *node);
    114 static service_id_t ext2fs_device_get(fs_node_t *node);
     114static service_id_t ext2fs_service_get(fs_node_t *node);
    115115
    116116/*
    … …  
    557557}
    558558
    559 service_id_t ext2fs_device_get(fs_node_t *fn)
     559service_id_t ext2fs_service_get(fs_node_t *fn)
    560560{
    561561        EXT2FS_DBG("");
    … …  
    581581        .is_directory = ext2fs_is_directory,
    582582        .is_file = ext2fs_is_file,
    583         .device_get = ext2fs_device_get
     583        .service_get = ext2fs_service_get
    584584};
    585585

  • uspace/srv/fs/fat/fat_ops.c

    r7a46bfe rfb7e5a9a  
    9090static bool fat_is_directory(fs_node_t *);
    9191static bool fat_is_file(fs_node_t *node);
    92 static service_id_t fat_device_get(fs_node_t *node);
     92static service_id_t fat_service_get(fs_node_t *node);
    9393
    9494/*
    … …  
    838838}
    839839
    840 service_id_t fat_device_get(fs_node_t *node)
     840service_id_t fat_service_get(fs_node_t *node)
    841841{
    842842        return 0;
    … …  
    860860        .is_directory = fat_is_directory,
    861861        .is_file = fat_is_file,
    862         .device_get = fat_device_get
     862        .service_get = fat_service_get
    863863};
    864864

  • uspace/srv/fs/locfs/locfs_ops.c

    r7a46bfe rfb7e5a9a  
    418418}
    419419
    420 static service_id_t locfs_device_get(fs_node_t *fn)
     420static service_id_t locfs_service_get(fs_node_t *fn)
    421421{
    422422        locfs_node_t *node = (locfs_node_t *) fn->data;
    … …  
    445445        .is_directory = locfs_is_directory,
    446446        .is_file = locfs_is_file,
    447         .device_get = locfs_device_get
     447        .service_get = locfs_service_get
    448448};
    449449

  • uspace/srv/fs/mfs/mfs_ops.c

    r7a46bfe rfb7e5a9a  
    5555static int mfs_has_children(bool *has_children, fs_node_t *fsnode);
    5656static int mfs_root_get(fs_node_t **rfn, service_id_t service_id);
    57 static service_id_t mfs_device_get(fs_node_t *fsnode);
     57static service_id_t mfs_service_get(fs_node_t *fsnode);
    5858static aoff64_t mfs_size_get(fs_node_t *node);
    5959static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);
    … …  
    8181        .size_get = mfs_size_get,
    8282        .root_get = mfs_root_get,
    83         .device_get = mfs_device_get,
     83        .service_get = mfs_service_get,
    8484        .is_directory = mfs_is_directory,
    8585        .is_file = mfs_is_file,
    … …  
    325325}
    326326
    327 service_id_t mfs_device_get(fs_node_t *fsnode)
     327service_id_t mfs_service_get(fs_node_t *fsnode)
    328328{
    329329        struct mfs_node *node = fsnode->data;

  • uspace/srv/fs/tmpfs/tmpfs_ops.c

    r7a46bfe rfb7e5a9a  
    114114}
    115115
    116 static service_id_t tmpfs_device_get(fs_node_t *fn)
     116static service_id_t tmpfs_service_get(fs_node_t *fn)
    117117{
    118118        return 0;
    … …  
    136136        .is_directory = tmpfs_is_directory,
    137137        .is_file = tmpfs_is_file,
    138         .device_get = tmpfs_device_get
     138        .service_get = tmpfs_service_get
    139139};
    140140
Note: See TracChangeset for help on using the changeset viewer.