Changeset e095644 in mainline for uspace/lib

Timestamp:

2010-01-24T17:32:20Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

50fda24

Parents:

fea0ce6 (diff), ae75e2e3 (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 partial support for the unmount feature.
VFS_OUT_UNMOUNT and VFS_OUT_UNMOUNTED not yet implemented by DEVFS, FAT and
TMPFS.

Location:

uspace/lib

Files:

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

uspace/lib/libc/generic/adt/hash_table.c

@@ -193 +193 @@
 }
 
+/** Apply fucntion to all items in hash table.
+ *
+ * @param h             Hash table.
+ * @param f             Function to be applied.
+ * @param arg           Argument to be passed to the function.
+ */
+void
+hash_table_apply(hash_table_t *h, void (*f)(link_t *, void *), void *arg)
+{
+        hash_index_t bucket;
+        link_t *cur;
+
+        for (bucket = 0; bucket < h->entries; bucket++) {
+                for (cur = h->entry[bucket].next; cur != &h->entry[bucket];
+                    cur = cur->next) {
+                        f(cur, arg);
+                }
+        }
+}
+
 /** @}
  */

uspace/lib/libc/generic/vfs/vfs.c

@@ -197 +197 @@
 }
 
+int unmount(const char *mp)
+{
+        ipcarg_t rc;
+        ipcarg_t rc_orig;
+        aid_t req;
+        size_t mpa_size;
+        char *mpa;
+        
+        mpa = absolutize(mp, &mpa_size);
+        if (!mpa)
+                return ENOMEM;
+        
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        req = async_send_0(vfs_phone, VFS_IN_UNMOUNT, NULL);
+        rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+        if (rc != EOK) {
+                async_wait_for(req, &rc_orig);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                free(mpa);
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        
+
+        async_wait_for(req, &rc);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        free(mpa);
+        
+        return (int) rc;
+}
+
 static int open_internal(const char *abs, size_t abs_size, int lflag, int oflag)
 {

uspace/lib/libc/include/adt/hash_table.h

@@ -88 +88 @@
 extern void hash_table_remove(hash_table_t *, unsigned long [], hash_count_t);
 extern void hash_table_destroy(hash_table_t *);
+extern void hash_table_apply(hash_table_t *, void (*)(link_t *, void *),
+    void *);
 
 #endif

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

@@ -86 +86 @@
         VFS_OUT_MOUNTED,
         VFS_OUT_UNMOUNT,
+        VFS_OUT_UNMOUNTED,
         VFS_OUT_SYNC,
         VFS_OUT_STAT,
@@ -140 +141 @@
 
 /**
- * L_OPEN is used to indicate that the lookup operation is a part of VFS_OPEN
+ * L_OPEN is used to indicate that the lookup operation is a part of VFS_IN_OPEN
  * call from the client. This means that the server might allocate some
  * resources for the opened file. This flag cannot be passed directly by the
@@ -147 +148 @@
 #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
+
 #endif
 

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

@@ -55 +55 @@
 extern int mount(const char *, const char *, const char *, const char *,
     unsigned int);
+extern int unmount(const char *);
 
 extern void __stdio_init(int filc, fdi_node_t *filv[]);

uspace/lib/libfs/libfs.c

@@ -304 +304 @@
                 on_error(rc, goto out_with_answer);
                 
-                if ((tmp) && (tmp->mp_data.mp_active)) {
+                /*
+                 * If the matching component is a mount point, there are two
+                 * legitimate semantics of the lookup operation. The first is
+                 * the commonly used one in which the lookup crosses each mount
+                 * point into the mounted file system. The second semantics is
+                 * used mostly during unmount() and differs from the first one
+                 * only in that the last mount point in the looked up path,
+                 * which is also its last component, is not crossed.
+                 */
+
+                if ((tmp) && (tmp->mp_data.mp_active) &&
+                    (!(lflag & L_NOCROSS_LAST_MP) || (next <= last))) {
                         if (next > last)
                                 next = last = first;