Changeset 49d871ea in mainline

Timestamp:

2010-10-05T19:53:42Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c0e74b1

Parents:

2b698d8 (diff), 1882525 (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:~jakub/helenos/fs.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -1355 +1355 @@
                 int ret = vfs_close_internal(newfile);
                 if (ret != EOK) {
+                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;
@@ -1361 +1362 @@
                 ret = vfs_fd_free(newfd);
                 if (ret != EOK) {
+                        fibril_mutex_unlock(&oldfile->lock);
                         ipc_answer_0(rid, ret);
                         return;