Changeset 83937ccd in mainline for uspace/srv

Timestamp:

2009-05-19T21:49:05Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

854c564

Parents:

27fd651

Message:

Rudimentary support for non-root mounts.

Location:

uspace/srv

Files:

• fs/fat/fat_ops.c (modified) (3 diffs)
• fs/tmpfs/tmpfs_ops.c (modified) (1 diff)
• vfs/vfs_ops.c (modified) (5 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -150 +150 @@
         }
         fat_node_initialize(nodep);
+        fs_node_initialize(fn);
         fn->data = nodep;
         nodep->bp = fn;
@@ -848 +849 @@
                 return;
         }
+        fs_node_initialize(rfn);
         fat_node_t *rootp = (fat_node_t *)malloc(sizeof(fat_node_t));
         if (!rootp) {
@@ -887 +889 @@
 void fat_mount(ipc_callid_t rid, ipc_call_t *request)
 {
-        ipc_answer_0(rid, ENOTSUP);
+        libfs_mount(&fat_libfs_ops, rid, request);
 }
 

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -251 +251 @@
                 return NULL;
         }
+        fs_node_initialize(nodep->bp);
         nodep->bp->data = nodep;        /* link the FS and TMPFS nodes */
         if (!tmpfs_root_get(dev_handle))

uspace/srv/vfs/vfs_ops.c

@@ -85 +85 @@
 {
         vfs_lookup_res_t mp_res;
+        vfs_lookup_res_t mr_res;
         vfs_node_t *mp_node = NULL;
+        vfs_node_t *mr_node;
+        fs_index_t rindex;
+        size_t rsize;
+        unsigned rlnkcnt;
         ipcarg_t rc;
         int phone;
         aid_t msg;
         ipc_call_t answer;
+                        
 
         /* Resolve the path to the mountpoint. */
@@ -130 +136 @@
                 /* We still don't have the root file system mounted. */
                 if (str_cmp(mp, "/") == 0) {
-                        vfs_lookup_res_t mr_res;
-                        vfs_node_t *mr_node;
-                        fs_index_t rindex;
-                        size_t rsize;
-                        unsigned rlnkcnt;
-                        
                         /*
                          * For this simple, but important case,
@@ -202 +202 @@
          */
         
+        int mountee_phone = vfs_grab_phone(fs_handle);
+        assert(mountee_phone >= 0);
+        vfs_release_phone(mountee_phone);
+
         phone = vfs_grab_phone(mp_res.triplet.fs_handle);
         msg = async_send_4(phone, VFS_MOUNT,
@@ -208 +212 @@
             (ipcarg_t) fs_handle,
             (ipcarg_t) dev_handle, &answer);
+        
+        /* send connection */
+        rc = async_req_1_0(phone, IPC_M_CONNECTION_CLONE, mountee_phone);
+        if (rc != EOK) {
+                async_wait_for(msg, NULL);
+                vfs_release_phone(phone);
+                /* Mount failed, drop reference to mp_node. */
+                if (mp_node)
+                        vfs_node_put(mp_node);
+                ipc_answer_0(rid, rc);
+                return;
+        }
+        
         /* send the mount options */
         rc = ipc_data_write_start(phone, (void *)opts, str_size(opts));
@@ -228 +245 @@
         }
         
+        rindex = (fs_index_t) IPC_GET_ARG1(answer);
+        rsize = (size_t) IPC_GET_ARG2(answer);
+        rlnkcnt = (unsigned) IPC_GET_ARG3(answer);
+        
+        mr_res.triplet.fs_handle = fs_handle;
+        mr_res.triplet.dev_handle = dev_handle;
+        mr_res.triplet.index = rindex;
+        mr_res.size = rsize;
+        mr_res.lnkcnt = rlnkcnt;
+        mr_res.type = VFS_NODE_DIRECTORY;
+        
+        /* Add reference to the mounted root. */
+        mr_node = vfs_node_get(&mr_res); 
+        assert(mr_node);
+
         ipc_answer_0(rid, rc);
 }