Changeset ff381a7 in mainline for uspace/srv/volsrv/empty.c


Ignore:
Timestamp:
2015-11-02T20:54:19Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d8513177
Parents:
3feeab2 (diff), 5265eea4 (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/volsrv/empty.c

    r3feeab2 rff381a7  
    9696        bool empty;
    9797
    98         rc = block_init(EXCHANGE_SERIALIZE, sid, 2048);
     98        rc = block_init(sid, 2048);
    9999        if (rc != EOK) {
    100100                log_msg(LOG_DEFAULT, LVL_ERROR, "Error opening "
    … …  
    186186        size_t block_size;
    187187
    188         rc = block_init(EXCHANGE_SERIALIZE, sid, 2048);
     188        rc = block_init(sid, 2048);
    189189        if (rc != EOK) {
    190190                log_msg(LOG_DEFAULT, LVL_ERROR, "Error opening "
Note: See TracChangeset for help on using the changeset viewer.