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

Changeset 190c943 in mainline


Ignore:
Timestamp:
2011-12-08T11:11:13Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
1adbf90
Parents:
24df3834 (diff), b741888 (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 from lp:exfat-helenos.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/exfat/exfat_directory.c

    r24df3834 r190c943  
    101101{
    102102        uint32_t i;
    103         int rc;
     103        int rc = EOK;
    104104
    105105        i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs);
     
    108108
    109109        if (di->b && di->bnum != i) {
    110                 block_put(di->b);
     110                rc = block_put(di->b);
    111111                di->b = NULL;
    112112        }
     
    126126                di->bnum = i;
    127127        }
    128         return EOK;
     128        return rc;
    129129}
    130130
     
    434434        int rc, count;
    435435        exfat_dentry_t *de;
     436
     437        di->pos = pos;
    436438
    437439        rc = exfat_directory_get(di, &de);
Note: See TracChangeset for help on using the changeset viewer.