Changeset c84146d3 in mainline


Ignore:
Timestamp:
2013-07-15T21:47:50Z (11 years ago)
Author:
Manuele Conti <conti.ma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e2f706e
Parents:
b86a32e
Message:

Replace name operations from total_block and free_block to total_block_count and
free_block_count

Location:
uspace
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/fs/libfs.c

    rb86a32e rc84146d3  
    864864        if (NULL != ops->size_block)   
    865865                statfs.f_bsize = ops->size_block(service_id);
    866         if (NULL != ops->total_block)
    867                 statfs.f_blocks = ops->total_block(service_id);
    868         if (NULL != ops->free_block)
    869                 statfs.f_bfree = ops->free_block(service_id);
     866        if (NULL != ops->total_block_count)
     867                statfs.f_blocks = ops->total_block_count(service_id);
     868        if (NULL != ops->free_block_count)
     869                statfs.f_bfree = ops->free_block_count(service_id);
    870870       
    871871        ops->node_put(fn);

  • uspace/lib/fs/libfs.h

    rb86a32e rc84146d3  
    9494        service_id_t (* service_get)(fs_node_t *);
    9595        uint32_t (* size_block)(service_id_t);
    96         uint64_t (* total_block)(service_id_t);
    97         uint64_t (* free_block)(service_id_t);
     96        uint64_t (* total_block_count)(service_id_t);
     97        uint64_t (* free_block_count)(service_id_t);
    9898} libfs_ops_t;
    9999

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

    rb86a32e rc84146d3  
    9090static service_id_t exfat_service_get(fs_node_t *node);
    9191static uint32_t exfat_size_block(service_id_t);
    92 static uint64_t exfat_total_block(service_id_t);
    93 static uint64_t exfat_free_block(service_id_t);
     92static uint64_t exfat_total_block_count(service_id_t);
     93static uint64_t exfat_free_block_count(service_id_t);
    9494
    9595/*
    … …  
    923923}
    924924
    925 uint64_t exfat_total_block(service_id_t service_id)
     925uint64_t exfat_total_block_count(service_id_t service_id)
    926926{
    927927        exfat_bs_t *bs;
    … …  
    933933}
    934934
    935 uint64_t exfat_free_block(service_id_t service_id)
     935uint64_t exfat_free_block_count(service_id_t service_id)
    936936{
    937937        exfat_bs_t *bs;
    … …  
    963963        .service_get = exfat_service_get,
    964964        .size_block = exfat_size_block,
    965         .total_block = exfat_total_block,
    966         .free_block = exfat_free_block
     965        .total_block_count = exfat_total_block_count,
     966        .free_block_count = exfat_free_block_count
    967967};
    968968

  • uspace/srv/fs/ext4fs/ext4fs_ops.c

    rb86a32e rc84146d3  
    102102static service_id_t ext4fs_service_get(fs_node_t *node);
    103103static uint32_t ext4fs_size_block(service_id_t);
    104 static uint64_t ext4fs_total_block(service_id_t);
    105 static uint64_t ext4fs_free_block(service_id_t);
     104static uint64_t ext4fs_total_block_count(service_id_t);
     105static uint64_t ext4fs_free_block_count(service_id_t);
    106106
    107107/* Static variables */
    … …  
    856856}
    857857
    858 uint64_t ext4fs_total_block(service_id_t service_id)
     858uint64_t ext4fs_total_block_count(service_id_t service_id)
    859859{
    860860        ext4fs_instance_t *inst;
    … …  
    871871}
    872872
    873 uint64_t ext4fs_free_block(service_id_t service_id)
     873uint64_t ext4fs_free_block_count(service_id_t service_id)
    874874{
    875875        ext4fs_instance_t *inst;
    … …  
    907907        .service_get = ext4fs_service_get,
    908908        .size_block = ext4fs_size_block,
    909         .total_block = ext4fs_total_block,
    910         .free_block = ext4fs_free_block
     909        .total_block_count = ext4fs_total_block_count,
     910        .free_block_count = ext4fs_free_block_count
    911911};
    912912

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

    rb86a32e rc84146d3  
    6565static bool is_power_of_two(uint32_t n);
    6666static uint32_t mfs_size_block(service_id_t service_id);
    67 static uint64_t mfs_total_block(service_id_t service_id);
    68 static uint64_t mfs_free_block(service_id_t service_id);
     67static uint64_t mfs_total_block_count(service_id_t service_id);
     68static uint64_t mfs_free_block_count(service_id_t service_id);
    6969
    7070static hash_table_t open_nodes;
    … …  
    8989        .lnkcnt_get = mfs_lnkcnt_get,
    9090        .size_block = mfs_size_block,
    91         .total_block = mfs_total_block,
    92         .free_block = mfs_free_block
     91        .total_block_count = mfs_total_block_count,
     92        .free_block_count = mfs_free_block_count
    9393};
    9494
    … …  
    11531153
    11541154static uint64_t
    1155 mfs_total_block(service_id_t service_id)
     1155mfs_total_block_count(service_id_t service_id)
    11561156{
    11571157        uint64_t block_total;
    … …  
    11711171
    11721172static uint64_t
    1173 mfs_free_block(service_id_t service_id)
     1173mfs_free_block_count(service_id_t service_id)
    11741174{
    11751175        uint32_t block_free;
Note: See TracChangeset for help on using the changeset viewer.