Changeset ce8c848 in mainline for uspace/lib

Timestamp:

2010-01-25T22:26:16Z (16 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.

Location:

uspace/lib

Files:

• libc/include/ipc/vfs.h (modified) (5 diffs)
• libfs/libfs.c (modified) (3 diffs)
• libfs/libfs.h (modified) (1 diff)

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

@@ -224 +224 @@
         ipc_answer_3(rid, rc, IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
             IPC_GET_ARG3(answer));
+}
+
+void libfs_unmount(libfs_ops_t *ops, ipc_callid_t rid, ipc_call_t *request)
+{
+        dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+        fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request);
+        fs_node_t *fn;
+        int res;
+
+        res = ops->node_get(&fn, mp_dev_handle, mp_fs_index);
+        if ((res != EOK) || (!fn)) {
+                ipc_answer_0(rid, combine_rc(res, ENOENT));
+                return;
+        }
+
+        /*
+         * We are clearly expecting to find the mount point active.
+         */
+        if (!fn->mp_data.mp_active) {
+                (void) ops->node_put(fn);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        /*
+         * Tell the mounted file system to unmount.
+         */
+        res = async_req_1_0(fn->mp_data.phone, VFS_OUT_UNMOUNTED,
+            fn->mp_data.dev_handle);
+
+        /*
+         * If everything went well, perform the clean-up on our side.
+         */
+        if (res == EOK) {
+                ipc_hangup(fn->mp_data.phone);
+                fn->mp_data.mp_active = false;
+                fn->mp_data.fs_handle = 0;
+                fn->mp_data.dev_handle = 0;
+                fn->mp_data.phone = 0;
+                /* Drop the reference created in libfs_mount(). */
+                (void) ops->node_put(fn);
+        }
+
+        (void) ops->node_put(fn);
+        ipc_answer_0(rid, res);
 }
 
@@ -315 +360 @@
 
                 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 +531 @@
                 goto out;
         }
+
+        if ((lflag & L_ROOT) && par) {
+                ipc_answer_0(rid, EINVAL);
+                goto out;
+        }
         
 out_with_answer:

uspace/lib/libfs/libfs.h

@@ -95 +95 @@
 
 extern void libfs_mount(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
+extern void libfs_unmount(libfs_ops_t *, ipc_callid_t, ipc_call_t *);
 extern void libfs_lookup(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);
 extern void libfs_stat(libfs_ops_t *, fs_handle_t, ipc_callid_t, ipc_call_t *);