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

Timestamp:

2010-12-25T17:14:36Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

092e4f1

Parents:

59e9398b (diff), 3ac66f69 (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) (1 diff)

uspace/srv/vfs/vfs_lookup.c

@@ -179 +179 @@
         fibril_mutex_unlock(&plb_mutex);
         
-        if (((int) rc < EOK) || (!result))
+        if ((int) rc < EOK)
                 return (int) rc;
+
+        if (!result)
+                return EOK;
         
         result->triplet.fs_handle = (fs_handle_t) rc;