Changeset 1b11576d in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2010-10-23T16:04:12Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c77b4d6

Parents:

84c20da (diff), 58b833c (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 mainline changes.

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;