Changeset f061de75 in mainline for uspace/srv/fs/exfat/exfat_directory.c

Timestamp:

2011-08-14T17:24:52Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

cd860fc

Parents:

25c60f4

Message:

exFAT: add exfat_directory_open_parent for managing parent directory
without node pointer

File:

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

uspace/srv/fs/exfat/exfat_directory.c

@@ -54 +54 @@
         di->bnum = 0;
         di->last = false;
+        di->fragmented = false;
+        di->firstc = 0;
 }
 
@@ -62 +64 @@
         if (di->nodep->type != EXFAT_DIRECTORY)
                 return EINVAL;
-
-        di->bs = block_bb_get(di->nodep->idx->devmap_handle);
-        di->blocks = di->nodep->size / BPS(di->bs);
+        di->devmap_handle = nodep->idx->devmap_handle;
+        di->fragmented = nodep->fragmented;
+        di->firstc = nodep->firstc;
+
+        di->bs = block_bb_get(di->devmap_handle);
+        di->blocks = nodep->size / BPS(di->bs);
+        return EOK;
+}
+
+int exfat_directory_open_parent(exfat_directory_t *di, 
+    devmap_handle_t devmap_handle, exfat_cluster_t firstc, bool fragmented)
+{
+        exfat_directory_init(di);
+        di->devmap_handle = devmap_handle;
+        di->fragmented = fragmented;
+        di->firstc = firstc;
+        di->bs = block_bb_get(devmap_handle);
+        di->blocks = 0;
         return EOK;
 }
@@ -84 +101 @@
 
         i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs);
-        if (i < di->blocks) {
-                if (di->b && di->bnum != i) {
-                        block_put(di->b);
+        if (di->nodep && (i >= di->blocks))
+                return ENOENT;
+
+        if (di->b && di->bnum != i) {
+                block_put(di->b);
+                di->b = NULL;
+        }
+        if (!di->b) {
+                if (di->nodep) {
+                        rc = exfat_block_get(&di->b, di->bs, di->nodep, i, BLOCK_FLAGS_NONE);
+                } else {
+                        rc = exfat_block_get_by_clst(&di->b, di->bs, di->devmap_handle,
+                            di->fragmented, di->firstc, NULL, i, BLOCK_FLAGS_NONE);
+                }
+                if (rc != EOK) {
                         di->b = NULL;
+                        return rc;
                 }
-                if (!di->b) {
-                        rc = exfat_block_get(&di->b, di->bs, di->nodep, i, BLOCK_FLAGS_NONE);
-                        if (rc != EOK) {
-                                di->b = NULL;
-                                return rc;
-                        }
-                        di->bnum = i;
-                }
-                return EOK;
-        }
-        return ENOENT;
+                di->bnum = i;
+        }
+        return EOK;
 }