Changeset ce8c848 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2010-01-25T22:26:16Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bb0d3d24

Parents:

64af8f1 (diff), c888102 (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 progress on the unmount feature.

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -92 +92 @@
                 }
                 
-                rc = vfs_lookup_internal(mp, L_DIRECTORY, &mp_res, NULL);
+                rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL);
                 if (rc != EOK) {
                         /* The lookup failed for some reason. */
@@ -459 +459 @@
          * Lookup the mounted root and instantiate it.
          */
-        rc = vfs_lookup_internal(mp, L_NONE, &mr_res, NULL);
+        rc = vfs_lookup_internal(mp, L_ROOT, &mr_res, NULL);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
@@ -521 +521 @@
                  */
 
-                /*
-                 * The L_NOCROSS_LAST_MP flag is essential if we really want to
-                 * lookup the mount point and not the mounted root.
-                 */
-                rc = vfs_lookup_internal(mp, L_NOCROSS_LAST_MP, &mp_res, NULL);
+                rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL);
                 free(mp);
                 if (rc != EOK) {
@@ -542 +538 @@
 
                 phone = vfs_grab_phone(mp_node->fs_handle);
-                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->fs_handle,
-                    mp_node->dev_handle);
+                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->dev_handle,
+                    mp_node->index);
                 vfs_release_phone(phone);
                 if (rc != EOK) {
@@ -595 +591 @@
         /*
          * Make sure that we are called with exactly one of L_FILE and
-         * L_DIRECTORY. Make sure that the user does not pass L_OPEN or
-         * L_NOCROSS_LAST_MP.
+         * L_DIRECTORY. Make sure that the user does not pass L_OPEN,
+         * L_ROOT or L_MP.
          */
         if (((lflag & (L_FILE | L_DIRECTORY)) == 0) ||
             ((lflag & (L_FILE | L_DIRECTORY)) == (L_FILE | L_DIRECTORY)) ||
-            (lflag & L_OPEN) || (lflag & L_NOCROSS_LAST_MP)) {
+            (lflag & (L_OPEN | L_ROOT | L_MP))) {
                 ipc_answer_0(rid, EINVAL);
                 return;