Changeset 190c943 in mainline

Timestamp:

2011-12-08T11:11:13Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

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:

• uspace/srv/fs/exfat/exfat_directory.c (modified) (4 diffs)

uspace/srv/fs/exfat/exfat_directory.c

@@ -101 +101 @@
 {
         uint32_t i;
-        int rc;
+        int rc = EOK;
 
         i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs);
@@ -108 +108 @@
 
         if (di->b && di->bnum != i) {
-                block_put(di->b);
+                rc = block_put(di->b);
                 di->b = NULL;
         }
@@ -126 +126 @@
                 di->bnum = i;
         }
-        return EOK;
+        return rc;
 }
 
@@ -434 +434 @@
         int rc, count;
         exfat_dentry_t *de;
+
+        di->pos = pos;
 
         rc = exfat_directory_get(di, &de);