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

Timestamp:

2010-01-25T21:04:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ea44bd1

Parents:

ae75e2e3

Message:

Rename L_NOCROSS_LAST_MP to L_MP and introduce L_ROOT.
Lookup the mounted root in vfs_unmount() using L_ROOT.

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -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) {
@@ -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;