Changeset 4f30222 in mainline


Ignore:
Timestamp:
2017-05-16T21:58:20Z (8 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3ec2acc
Parents:
dde4689
Message:

VFS_OUT_MOUNTED does not need to return the link count

Location:
uspace
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/ext4/src/ops.c

    rdde4689 r4f30222  
    920920 * @param index      Output value - index of root node
    921921 * @param size       Output value - size of root node
    922  * @param lnkcnt     Output value - link count of root node
    923922 *
    924923 * @return Error code
    … …  
    926925 */
    927926static int ext4_mounted(service_id_t service_id, const char *opts,
    928     fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
     927    fs_index_t *index, aoff64_t *size)
    929928{
    930929        ext4_filesystem_t *fs;
    … …  
    962961        *index = EXT4_INODE_ROOT_INDEX;
    963962        *size = rnsize;
    964         *lnkcnt = 1;
    965963       
    966964        return EOK;

  • uspace/lib/fs/libfs.c

    rdde4689 r4f30222  
    123123        fs_index_t index;
    124124        aoff64_t size;
    125         unsigned lnkcnt;
    126         rc = vfs_out_ops->mounted(service_id, opts, &index, &size, &lnkcnt);
     125        rc = vfs_out_ops->mounted(service_id, opts, &index, &size);
    127126
    128127        if (rc == EOK)
    129                 async_answer_4(rid, EOK, index, LOWER32(size), UPPER32(size),
    130                     lnkcnt);
     128                async_answer_3(rid, EOK, index, LOWER32(size), UPPER32(size));
    131129        else
    132130                async_answer_0(rid, rc);

  • uspace/lib/fs/libfs.h

    rdde4689 r4f30222  
    4444typedef struct {
    4545        int (* fsprobe)(service_id_t, vfs_fs_probe_info_t *);
    46         int (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *,
    47             unsigned *);
     46        int (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *);
    4847        int (* unmounted)(service_id_t);
    4948        int (* read)(service_id_t, fs_index_t, aoff64_t, size_t *);

  • uspace/srv/fs/cdfs/cdfs_ops.c

    rdde4689 r4f30222  
    11191119
    11201120static int cdfs_mounted(service_id_t service_id, const char *opts,
    1121     fs_index_t *index, aoff64_t *size, unsigned int *lnkcnt)
     1121    fs_index_t *index, aoff64_t *size)
    11221122{
    11231123        /* Initialize the block layer */
    … …  
    11761176        *index = root->index;
    11771177        *size = root->size;
    1178         *lnkcnt = root->lnkcnt;
    11791178       
    11801179        return EOK;

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

    rdde4689 r4f30222  
    10811081static int
    10821082exfat_mounted(service_id_t service_id, const char *opts, fs_index_t *index,
    1083     aoff64_t *size, unsigned *linkcnt)
     1083    aoff64_t *size)
    10841084{
    10851085        int rc;
    … …  
    12591259        *index = rootp->idx->index;
    12601260        *size = rootp->size;
    1261         *linkcnt = rootp->lnkcnt;
    12621261       
    12631262        return EOK;

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

    rdde4689 r4f30222  
    956956static int
    957957fat_mounted(service_id_t service_id, const char *opts, fs_index_t *index,
    958     aoff64_t *size, unsigned *linkcnt)
     958    aoff64_t *size)
    959959{
    960960        enum cache_mode cmode = CACHE_MODE_WB;
    … …  
    11051105        *index = ridxp->index;
    11061106        *size = rootp->size;
    1107         *linkcnt = rootp->lnkcnt;
    11081107
    11091108        return EOK;

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

    rdde4689 r4f30222  
    461461
    462462static int locfs_mounted(service_id_t service_id, const char *opts,
    463     fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
     463    fs_index_t *index, aoff64_t *size)
    464464{
    465465        *index = 0;
    466466        *size = 0;
    467         *lnkcnt = 0;
    468467        return EOK;
    469468}

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

    rdde4689 r4f30222  
    296296static int
    297297mfs_mounted(service_id_t service_id, const char *opts, fs_index_t *index,
    298     aoff64_t *size, unsigned *linkcnt)
     298    aoff64_t *size)
    299299{
    300300        enum cache_mode cmode;
    … …  
    353353        *index = mroot->ino_i->index;
    354354        *size = mroot->ino_i->i_size;
    355         *linkcnt = 1;
    356355
    357356        return mfs_node_put(fn);

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

    rdde4689 r4f30222  
    427427
    428428static int
    429 tmpfs_mounted(service_id_t service_id, const char *opts,
    430     fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
     429tmpfs_mounted(service_id_t service_id, const char *opts, fs_index_t *index,
     430    aoff64_t *size)
    431431{
    432432        fs_node_t *rootfn;
    … …  
    454454        *index = rootp->index;
    455455        *size = rootp->size;
    456         *lnkcnt = rootp->lnkcnt;
    457456
    458457        return EOK;

  • uspace/srv/fs/udf/udf_ops.c

    rdde4689 r4f30222  
    305305
    306306static int udf_mounted(service_id_t service_id, const char *opts,
    307     fs_index_t *index, aoff64_t *size, unsigned *linkcnt)
     307    fs_index_t *index, aoff64_t *size)
    308308{
    309309        enum cache_mode cmode;
    … …  
    411411        *index = instance->volumes[DEFAULT_VOL].root_dir;
    412412        *size = node->data_size;
    413         *linkcnt = node->link_cnt;
    414413       
    415414        return EOK;
Note: See TracChangeset for help on using the changeset viewer.