Changeset 8810c63 in mainline

Timestamp:

2009-10-01T11:50:28Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5643a04, f5af635

Parents:

9a15176

Message:

Do not assume that a block is not dirty if we did not make it dirty.
It could have been already dirty when we got a reference to it.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -331 +331 @@
                                 continue;
                         case FAT_DENTRY_LAST:
+                                /* miss */
                                 rc = block_put(b);
-                                /* expect EOK as b was not dirty */
-                                assert(rc == EOK);      
                                 fibril_mutex_unlock(&parentp->idx->lock);
                                 *rfn = NULL;
-                                return EOK;
+                                return rc;
                         default:
                         case FAT_DENTRY_VALID:
@@ -361 +360 @@
                                          */
                                         rc = block_put(b);
-                                        /* expect EOK as b was not dirty */
-                                        assert(rc == EOK);      
-                                        return ENOMEM;
+                                        return (rc == EOK) ? ENOMEM : rc;
                                 }
                                 rc = fat_node_get_core(&nodep, idx);
                                 assert(rc == EOK);
                                 fibril_mutex_unlock(&idx->lock);
-                                rc = block_put(b);
-                                /* expect EOK as b was not dirty */
-                                assert(rc == EOK);
+                                (void) block_put(b);
                                 *rfn = FS_NODE(nodep);
                                 return EOK;
@@ -376 +371 @@
                 }
                 rc = block_put(b);
-                assert(rc == EOK);      /* expect EOK as b was not dirty */
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&parentp->idx->lock);
+                        return rc;
+                }
         }
 
@@ -810 +808 @@
                         case FAT_DENTRY_LAST:
                                 rc = block_put(b);
-                                /* expect EOK as b was not dirty */
-                                assert(rc == EOK);
                                 fibril_mutex_unlock(&nodep->idx->lock);
                                 *has_children = false;
-                                return EOK;
+                                return rc;
                         default:
                         case FAT_DENTRY_VALID:
                                 rc = block_put(b);
-                                /* expect EOK as b was not dirty */
-                                assert(rc == EOK);
                                 fibril_mutex_unlock(&nodep->idx->lock);
                                 *has_children = true;
-                                return EOK;
+                                return rc;
                         }
                 }
                 rc = block_put(b);
-                assert(rc == EOK);      /* expect EOK as b was not dirty */
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&nodep->idx->lock);
+                        return rc;      
+                }
         }