Changeset f14291b in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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_lookup.c (modified) (2 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -168 +168 @@
         ipcarg_t rc;
         async_wait_for(req, &rc);
-        vfs_release_phone(phone);
+        vfs_release_phone(root->fs_handle, phone);
         
         fibril_mutex_lock(&plb_mutex);
@@ -215 +215 @@
         ipcarg_t rc;
         async_wait_for(req, &rc);
-        vfs_release_phone(phone);
+        vfs_release_phone(result->triplet.fs_handle, phone);
         
         if (rc == EOK) {