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

Changeset 16e9d4df in mainline


Ignore:
Timestamp:
2012-08-24T15:56:54Z (8 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
master
Children:
4c84ada5
Parents:
276e44a (diff), 070ad12 (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

Files:
15 added
3 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r276e44a r16e9d4df  
    107107        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
    108108        $(USPACE_PATH)/srv/fs/exfat/exfat \
     109        $(USPACE_PATH)/srv/fs/udf/udf \
    109110        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
    110111        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
  • uspace/Makefile

    r276e44a r16e9d4df  
    9696        srv/bd/part/mbr_part \
    9797        srv/fs/exfat \
     98        srv/fs/udf \
    9899        srv/fs/fat \
    99100        srv/fs/cdfs \
  • uspace/lib/ext4/libext4_filesystem.c

    r276e44a r16e9d4df  
    12841284        block_t *block;
    12851285        while (level > 0) {
     1286               
     1287                /* Sparse check */
     1288                if (current_block == 0)
     1289                        return EOK;
     1290               
    12861291                int rc = block_get(&block, fs->device, current_block, 0);
    12871292                if (rc != EOK)
Note: See TracChangeset for help on using the changeset viewer.