Changeset eb40d86 in mainline for uspace


Ignore:
Timestamp:
2013-09-13T15:57:46Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fd7dbbb
Parents:
1eaa3cf (diff), cc8044e (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:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/ext4fs/ext4fs_ops.c

    r1eaa3cf reb40d86  
    876876        if (rc != EOK)
    877877                return rc;
    878         if (NULL == inst)
    879                 return ENOENT;
    880878
    881879        ext4_superblock_t *sb = inst->filesystem->superblock;
  • uspace/srv/fs/mfs/mfs_ops.c

    r1eaa3cf reb40d86  
    12011201        *count = sbi->nfree_zones;
    12021202
    1203         return EOK;
     1203        return rc;
    12041204}
    12051205
Note: See TracChangeset for help on using the changeset viewer.