Changeset 6843a9c in mainline for uspace/srv/fs/mfs/mfs_rw.c


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rba72f2b r6843a9c  
    147147                                ino_i->dirty = true;
    148148                        } else {
    149                                 /*Sparse block*/
     149                                /* Sparse block */
    150150                                *b = 0;
    151151                                return EOK;
    … …  
    233233}
    234234
    235 /**Free unused indirect zones from a MINIX inode according to it's new size.
     235/**Free unused indirect zones from a MINIX inode according to its new size.
    236236 *
    237237 * @param mnode         Pointer to a generic MINIX inode in memory.
Note: See TracChangeset for help on using the changeset viewer.