Changeset 6843a9c in mainline for uspace/srv/fs/mfs/mfs_dentry.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_dentry.c

    rba72f2b r6843a9c  
    168168                return ENAMETOOLONG;
    169169
    170         /*Search the directory entry to be removed*/
     170        /* Search the directory entry to be removed */
    171171        unsigned i;
    172172        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {
Note: See TracChangeset for help on using the changeset viewer.