Changeset f7376cbf in mainline

Timestamp:

2010-01-25T21:04:49Z (15 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.

Location:

uspace

Files:

• lib/libc/include/ipc/vfs.h (modified) (5 diffs)
• lib/libfs/libfs.c (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/lib/libc/include/ipc/vfs.h

@@ -101 +101 @@
  * No lookup flags used.
  */
-#define L_NONE  0
+#define L_NONE                  0
 
 /**
@@ -108 +108 @@
  * with L_DIRECTORY.
  */
-#define L_FILE  1
+#define L_FILE                  1
 
 /**
- * Lookup wil succeed only if the object is a directory. If L_CREATE is
+ * Lookup will succeed only if the object is a directory. If L_CREATE is
  * specified, an empty directory will be created. This flag is mutually
  * exclusive with L_FILE.
  */
-#define L_DIRECTORY  2
+#define L_DIRECTORY             2
+
+/**
+ * Lookup will succeed only if the object is a root directory. The flag is
+ * mutually exclusive with L_FILE and L_MP.
+ */
+#define L_ROOT                  4
+
+/**
+ * Lookup will succeed only if the object is a mount point. The flag is mutually
+ * exclusive with L_FILE and L_ROOT.
+ */
+#define L_MP                    8
+
 
 /**
@@ -121 +134 @@
  * object already exists. L_EXCLUSIVE is implied when L_DIRECTORY is used.
  */
-#define L_EXCLUSIVE  4
+#define L_EXCLUSIVE             16
 
 /**
  * L_CREATE is used for creating both regular files and directories.
  */
-#define L_CREATE  8
+#define L_CREATE                32
 
 /**
  * L_LINK is used for linking to an already existing nodes.
  */
-#define L_LINK  16
+#define L_LINK                  64
 
 /**
@@ -138 +151 @@
  * VFS_UNLINK.
  */
-#define L_UNLINK  32
+#define L_UNLINK                128
 
 /**
@@ -146 +159 @@
  * client.
  */
-#define L_OPEN  64
-
-/**
- * L_NOCROSS_LAST_MP is used exclusively during the VFS_IN_UNMOUNT operation. It
- * tells the lookup routine not to cross the last mount point in the lookup
- * path.
- */
-#define L_NOCROSS_LAST_MP       128
+#define L_OPEN                  256
 
 #endif

uspace/lib/libfs/libfs.c

@@ -315 +315 @@
 
                 if ((tmp) && (tmp->mp_data.mp_active) &&
-                    (!(lflag & L_NOCROSS_LAST_MP) || (next <= last))) {
+                    (!(lflag & L_MP) || (next <= last))) {
                         if (next > last)
                                 next = last = first;
@@ -486 +486 @@
                 goto out;
         }
+
+        if ((lflag & L_ROOT) && par) {
+                ipc_answer_0(rid, EINVAL);
+                goto out;
+        }
         
 out_with_answer:

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;