Changeset 7bdcc45 in mainline for uspace/srv/fs/fat


Ignore:
Timestamp:
2010-12-16T16:38:49Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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/fat
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/fat/fat.c

    r8e58f94 r7bdcc45  
    5252vfs_info_t fat_vfs_info = {
    5353        .name = NAME,
     54        .concurrent_read_write = false,
     55        .write_retains_size = false,   
    5456};
    5557
     
    9193       
    9294                callid = async_get_call(&call);
    93                 switch  (IPC_GET_METHOD(call)) {
     95                switch  (IPC_GET_IMETHOD(call)) {
    9496                case IPC_M_PHONE_HUNGUP:
    9597                        return;
  • uspace/srv/fs/fat/fat_ops.c

    r8e58f94 r7bdcc45  
    12571257
    12581258        rc = fat_node_put(fn);
    1259         ipc_answer_1(rid, rc, (ipcarg_t)bytes);
     1259        ipc_answer_1(rid, rc, (sysarg_t)bytes);
    12601260}
    12611261
Note: See TracChangeset for help on using the changeset viewer.