Changeset 5ab597d in mainline

Timestamp:

2008-08-22T19:44:52Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

be8f92d

Parents:

2e4bd1f

Message:

Add reference to the mounted FS root.

This makes it possible to keep the FS root logically unlinked (i.e. lnkcnt == 0)
because it prevents VFS from attempting to destroy it during closedir().

Location:

uspace/srv

Files:

• fs/fat/fat_ops.c (modified) (2 diffs)
• fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)
• vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -738 +738 @@
         rootp->firstc = FAT_CLST_ROOT;
         rootp->refcnt = 1;
+        rootp->lnkcnt = 0;      /* FS root is not linked */
         rootp->size = rde * sizeof(fat_dentry_t);
         rootp->idx = ridxp;
@@ -744 +745 @@
         futex_up(&ridxp->lock);
 
-        ipc_answer_0(rid, EOK);
+        ipc_answer_3(rid, EOK, ridxp->index, rootp->size, rootp->lnkcnt);
 }
 

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -234 +234 @@
                 return false;
         }
-        root->lnkcnt = 1;
+        root->lnkcnt = 0;       /* FS root is not linked */
         return true;
 }
@@ -406 +406 @@
         if (dev_handle >= 0) {
                 if (tmpfs_restore(dev_handle))
-                        ipc_answer_0(rid, EOK);
+                        ipc_answer_3(rid, EOK, root->index, root->size,
+                            root->lnkcnt);
                 else
                         ipc_answer_0(rid, ELIMIT);
         } else {
-                        ipc_answer_0(rid, EOK);
+                ipc_answer_3(rid, EOK, root->index, root->size, root->lnkcnt);
         }
 }

uspace/srv/vfs/vfs_ops.c

@@ -206 +206 @@
                 /* We still don't have the root file system mounted. */
                 if ((size == 1) && (buf[0] == '/')) {
+                        vfs_lookup_res_t mr_res;
+                        vfs_node_t *mr_node;
+                        ipcarg_t rindex;
+                        ipcarg_t rsize;
+                        ipcarg_t rlnkcnt;
+                
                         /*
                          * For this simple, but important case,
@@ -214 +220 @@
                         /* Tell the mountee that it is being mounted. */
                         phone = vfs_grab_phone(fs_handle);
-                        rc = async_req_1_0(phone, VFS_MOUNTED,
-                            (ipcarg_t) dev_handle);
+                        rc = async_req_1_3(phone, VFS_MOUNTED,
+                            (ipcarg_t) dev_handle, &rindex, &rsize, &rlnkcnt);
                         vfs_release_phone(phone);
-
-                        if (rc == EOK) {
-                                rootfs.fs_handle = fs_handle;
-                                rootfs.dev_handle = dev_handle;
+                        
+                        if (rc != EOK) {
+                                futex_up(&rootfs_futex);
+                                ipc_answer_0(rid, rc);
+                                return;
                         }
 
+                        mr_res.triplet.fs_handle = fs_handle;
+                        mr_res.triplet.dev_handle = dev_handle;
+                        mr_res.triplet.index = (fs_index_t) rindex;
+                        mr_res.size = (size_t) rsize;
+                        mr_res.lnkcnt = (unsigned) rlnkcnt;
+
+                        rootfs.fs_handle = fs_handle;
+                        rootfs.dev_handle = dev_handle;
                         futex_up(&rootfs_futex);
+
+                        /* Add reference to the mounted root. */
+                        mr_node = vfs_node_get(&mr_res); 
+                        assert(mr_node);
+
                         ipc_answer_0(rid, rc);
                         return;