Changeset 0be611b in mainline

Timestamp:

2011-08-26T23:42:52Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4cf5ed46

Parents:

7ece4247

Message:

Do not leave parentp→idx→lock locked when returning from fat_link().

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -604 +604 @@
         bs = block_bb_get(parentp->idx->service_id);
         rc = fat_directory_open(parentp, &di);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
 
         /*
@@ -616 +618 @@
 
         rc = fat_directory_write(&di, name, &de);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                (void) fat_directory_close(&di);
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
         rc = fat_directory_close(&di);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                fibril_mutex_unlock(&parentp->idx->lock);
+                return rc;
+        }
 
         fibril_mutex_unlock(&parentp->idx->lock);
-        if (rc != EOK)
-                return rc;
 
         fibril_mutex_lock(&childp->idx->lock);