Changeset 46c0498 in mainline

Timestamp:

2009-09-21T16:09:42Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

edb14ca

Parents:

4b4668e

Message:

Make fat_unlink() return an error code instead of hitting an assertion on an I/O
error.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -606 +606 @@
             (childp->idx->pdi * sizeof(fat_dentry_t)) / bps,
             BLOCK_FLAGS_NONE);
-        assert(rc == EOK);
+        if (rc != EOK) 
+                goto error;
         d = (fat_dentry_t *)b->data +
             (childp->idx->pdi % (bps / sizeof(fat_dentry_t)));
@@ -613 +614 @@
         b->dirty = true;                /* need to sync block */
         rc = block_put(b);
-        assert(rc == EOK);
+        if (rc != EOK)
+                goto error;
 
         /* remove the index structure from the position hash */
@@ -627 +629 @@
 
         return EOK;
+
+error:
+        fibril_mutex_unlock(&parentp->idx->lock);
+        fibril_mutex_unlock(&childp->lock);
+        fibril_mutex_unlock(&childp->idx->lock);
+        return rc;
 }