Changeset 76a67ce in mainline

Timestamp:

2011-11-05T12:35:09Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

4965357f

Parents:

10e4cd7

Message:

vfs_get_mtab:

• Remove mtab entry when unmounting a filesystem
• Add vfs_get_mtab() implementation

Location:

uspace/srv/vfs

Files:

• vfs.c (modified) (1 diff)
• vfs.h (modified) (1 diff)
• vfs_ops.c (modified) (7 diffs)

uspace/srv/vfs/vfs.c

@@ -128 +128 @@
                         break;
                 case VFS_IN_GET_MTAB:
-                        //vfs_get_mounted_fs_info(callid, &call);
+                        vfs_get_mtab(callid, &call);
                         break;
                 default:

uspace/srv/vfs/vfs.h

@@ -220 +220 @@
 extern void vfs_rename(ipc_callid_t, ipc_call_t *);
 extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *);
+extern void vfs_get_mtab(ipc_callid_t, ipc_call_t *);
 
 #endif

uspace/srv/vfs/vfs_ops.c

@@ -464 +464 @@
                  */
                 
-                free(mp);
-                
                 exch = vfs_exchange_grab(mr_node->fs_handle);
                 rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED,
@@ -473 +471 @@
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mr_node);
                         async_answer_0(rid, rc);
@@ -490 +489 @@
                 
                 rc = vfs_lookup_internal(mp, L_MP, &mp_res, NULL);
-                free(mp);
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mr_node);
                         async_answer_0(rid, rc);
@@ -501 +500 @@
                 if (!mp_node) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mr_node);
                         async_answer_0(rid, ENOMEM);
@@ -513 +513 @@
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        free(mp);
                         vfs_node_put(mp_node);
                         vfs_node_put(mr_node);
@@ -530 +531 @@
          */
         vfs_node_forget(mr_node);
-        
         fibril_rwlock_write_unlock(&namespace_rwlock);
+
+        fibril_mutex_lock(&mtab_list_lock);
+
+        int found = 0;
+
+        list_foreach(mtab_list, cur) {
+                mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+                    link);
+
+                mtab_ent_t *mtab_ent = &ent->mtab_ent;
+
+                if (str_cmp(mtab_ent->mp, mp) == 0) {
+                        list_remove(&ent->link);
+                        mtab_size--;
+                        free(ent);
+                        found = 1;
+                        break;
+                }
+        }
+        assert(found);
+
+        free(mp);
+
+        fibril_mutex_unlock(&mtab_list_lock);
         async_answer_0(rid, EOK);
 }
@@ -1320 +1344 @@
 }
 
+void vfs_get_mtab(ipc_callid_t rid, ipc_call_t *request)
+{
+        ipc_callid_t callid;
+        ipc_call_t data;
+        sysarg_t rc = EOK;
+        size_t len;
+
+        fibril_mutex_lock(&mtab_list_lock);
+
+        /* Send to the caller the number of mounted filesystems */
+        callid = async_get_call(&data);
+        if (IPC_GET_IMETHOD(data) != VFS_IN_PING) {
+                rc = ENOTSUP;
+                async_answer_1(callid, rc, 0);
+                goto exit;
+        }
+        async_answer_1(callid, EOK, mtab_size);
+
+        list_foreach(mtab_list, cur) {
+                mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+                    link);
+
+                mtab_ent_t *mtab_ent = &ent->mtab_ent;
+
+                rc = ENOTSUP;
+
+                if (!async_data_read_receive(&callid, &len))
+                        goto exit;
+
+                (void) async_data_read_finalize(callid, mtab_ent->mp,
+                    str_size(mtab_ent->mp));
+
+                if (!async_data_read_receive(&callid, &len))
+                        goto exit;
+
+                (void) async_data_read_finalize(callid, mtab_ent->opts,
+                    str_size(mtab_ent->opts));
+
+                if (!async_data_read_receive(&callid, &len))
+                        goto exit;
+
+                (void) async_data_read_finalize(callid, mtab_ent->fs_name,
+                    str_size(mtab_ent->fs_name));
+
+                sysarg_t p[3];
+
+                p[0] = mtab_ent->flags;
+                p[1] = mtab_ent->instance;
+                p[2] = mtab_ent->fs_handle;
+
+                int i;
+                for (i = 0; i < 3; ++i) {
+                        callid = async_get_call(&data);
+                        if (IPC_GET_IMETHOD(data) != VFS_IN_PING) {
+                                rc = ENOTSUP;
+                                async_answer_1(callid, rc, 0);
+                                goto exit;
+                        }
+                        async_answer_1(callid, EOK, p[i]);
+                }
+
+                rc = EOK;
+        }
+
+exit:
+        fibril_mutex_unlock(&mtab_list_lock);
+        async_answer_0(rid, rc);
+}
+
 /**
  * @}