Changeset 35b7d86e in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2017-03-13T20:33:06Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8ffedd8

Parents:

ea56098

Message:

Remove VFS_IN_MTAB_GET

The mountpoints in VFS don't know their path anymore and it does not
make much sense to maintain this global mount table when tasks can have
different roots.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (7 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -52 +52 @@
 #include <assert.h>
 #include <vfs/canonify.h>
-#include <vfs/vfs_mtab.h>
-
-FIBRIL_MUTEX_INITIALIZE(mtab_list_lock);
-LIST_INITIALIZE(mtab_list);
-static size_t mtab_size = 0;
 
 /* Forward declarations of static functions. */
@@ -243 +238 @@
         vfs_file_t *file = NULL;
         int fd = -1;
-        mtab_ent_t *mtab_ent = NULL;
         
         if (!(flags & VFS_MOUNT_CONNECT_ONLY)) {
@@ -274 +268 @@
                         goto out;
                 }
-        }
-        
-        /* Add the filesystem info to the list of mounted filesystems */
-        mtab_ent = malloc(sizeof(mtab_ent_t));
-        if (!mtab_ent) {
-                rc = ENOMEM;
-                goto out;
         }
         
@@ -301 +288 @@
         }
         
-        
         if (flags & VFS_MOUNT_NO_REF) {
                 vfs_node_delref(root);
@@ -313 +299 @@
         }
         
-        /* Add the filesystem info to the list of mounted filesystems */
-        str_cpy(mtab_ent->mp, MAX_PATH_LEN, "fixme");
-        str_cpy(mtab_ent->fs_name, FS_NAME_MAXLEN, fs_name);
-        str_cpy(mtab_ent->opts, MAX_MNTOPTS_LEN, opts);
-        mtab_ent->instance = instance;
-        mtab_ent->service_id = service_id;
-
-        link_initialize(&mtab_ent->link);
-
-        fibril_mutex_lock(&mtab_list_lock);
-        list_append(&mtab_ent->link, &mtab_list);
-        mtab_size++;
-        fibril_mutex_unlock(&mtab_list_lock);   
-
 out:
         if (mp) {
@@ -340 +312 @@
         
         *outfd = fd;
-        return rc;
-}
-
-int vfs_op_mtab_get(void)
-{
-        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_0(callid, rc);
-                goto exit;
-        }
-        async_answer_1(callid, EOK, mtab_size);
-
-        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
-                rc = ENOTSUP;
-
-                if (!async_data_read_receive(&callid, &len)) {
-                        async_answer_0(callid, rc);
-                        goto exit;
-                }
-
-                (void) async_data_read_finalize(callid, mtab_ent->mp,
-                    str_size(mtab_ent->mp));
-
-                if (!async_data_read_receive(&callid, &len)) {
-                        async_answer_0(callid, rc);
-                        goto exit;
-                }
-
-                (void) async_data_read_finalize(callid, mtab_ent->opts,
-                    str_size(mtab_ent->opts));
-
-                if (!async_data_read_receive(&callid, &len)) {
-                        async_answer_0(callid, rc);
-                        goto exit;
-                }
-
-                (void) async_data_read_finalize(callid, mtab_ent->fs_name,
-                    str_size(mtab_ent->fs_name));
-
-                callid = async_get_call(&data);
-
-                if (IPC_GET_IMETHOD(data) != VFS_IN_PING) {
-                        async_answer_0(callid, rc);
-                        goto exit;
-                }
-
-                rc = EOK;
-                async_answer_2(callid, rc, mtab_ent->instance,
-                    mtab_ent->service_id);
-        }
-
-exit:
-        fibril_mutex_unlock(&mtab_list_lock);
         return rc;
 }
@@ -984 +894 @@
         fibril_rwlock_write_unlock(&namespace_rwlock);
         
-        fibril_mutex_lock(&mtab_list_lock);
-        int found = 0;
-
-        list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
-                // FIXME: mp name
-                if (str_cmp(mtab_ent->mp, "fixme") == 0) {
-                        list_remove(&mtab_ent->link);
-                        mtab_size--;
-                        free(mtab_ent);
-                        found = 1;
-                        break;
-                }
-        }
-        assert(found);
-        fibril_mutex_unlock(&mtab_list_lock);
-        
         vfs_file_put(mp);
         return EOK;