Changeset b14d9f9 in mainline for uspace/srv/vfs

Timestamp:

2017-05-05T17:37:36Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

951f6b9e

Parents:

75b24cd

Message:

Mount should be able to print the list of available file system types.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (2 diffs)
• vfs_ipc.c (modified) (3 diffs)
• vfs_ops.c (modified) (1 diff)
• vfs_register.c (modified) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -43 +43 @@
 #include <ipc/vfs.h>
 #include <task.h>
+#include <vfs/vfs.h>
 
 #ifndef dprintf
@@ -174 +175 @@
 extern fs_handle_t fs_name_to_handle(unsigned int instance, const char *, bool);
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
+extern int vfs_get_fstypes(vfs_fstypes_t *);
 
 extern int vfs_lookup_internal(vfs_node_t *, char *, int, vfs_lookup_res_t *);

uspace/srv/vfs/vfs_ipc.c

@@ -27 +27 @@
  */
 
+#include <vfs/vfs.h>
 #include "vfs.h"
 
@@ -42 +43 @@
         int ret = vfs_op_clone(oldfd, newfd, desc);
         async_answer_0(rid, ret);
+}
+
+static void vfs_in_fstypes(ipc_callid_t rid, ipc_call_t *request)
+{
+        ipc_callid_t callid;
+        size_t len;
+        vfs_fstypes_t fstypes;
+        int rc;
+
+        rc = vfs_get_fstypes(&fstypes);
+        if (rc != EOK) {
+                async_answer_0(rid, ENOMEM);
+                return;
+        }
+
+        /* Send size of the data */
+        async_answer_1(rid, EOK, fstypes.size);
+
+        /* Now we should get a read request */
+        if (!async_data_read_receive(&callid, &len))
+                goto out;
+
+        if (len > fstypes.size)
+                len = fstypes.size;
+        (void) async_data_read_finalize(callid, fstypes.buf, len);
+
+out:
+        vfs_fstypes_free(&fstypes);
 }
 
@@ -268 +297 @@
                         vfs_in_clone(callid, &call);
                         break;
+                case VFS_IN_FSTYPES:
+                        vfs_in_fstypes(callid, &call);
+                        break;
                 case VFS_IN_MOUNT:
                         vfs_in_mount(callid, &call);

uspace/srv/vfs/vfs_ops.c

@@ -147 +147 @@
 
         if (fs_handle == 0)
-                return ENOENT;
+                return ENOFS;
         
         /* Tell the mountee that it is being mounted. */

uspace/srv/vfs/vfs_register.c

@@ -50 +50 @@
 #include <assert.h>
 #include <atomic.h>
+#include <vfs/vfs.h>
 #include "vfs.h"
 
@@ -340 +341 @@
 }
 
+/** Get list of file system types.
+ *
+ * @param fstypes Place to store list of file system types. Free using
+ *                vfs_fstypes_free().
+ *
+ * @return EOK on success or negative error code
+ */
+int vfs_get_fstypes(vfs_fstypes_t *fstypes)
+{
+        size_t size;
+        size_t count;
+        size_t l;
+
+        fibril_mutex_lock(&fs_list_lock);
+        
+        size = 0;
+        count = 0;
+        list_foreach(fs_list, fs_link, fs_info_t, fs) {
+                size += str_size(fs->vfs_info.name) + 1;
+                count++;
+        }
+        
+        if (size == 0)
+                size = 1;
+        
+        fstypes->buf = calloc(1, size);
+        if (fstypes->buf == NULL) {
+                fibril_mutex_unlock(&fs_list_lock);
+                return ENOMEM;
+        }
+        
+        fstypes->fstypes = calloc(sizeof(char *), count);
+        if (fstypes->fstypes == NULL) {
+                free(fstypes->buf);
+                fstypes->buf = NULL;
+                fibril_mutex_unlock(&fs_list_lock);
+                return ENOMEM;
+        }
+        
+        fstypes->size = size;
+        
+        size = 0; count = 0;
+        list_foreach(fs_list, fs_link, fs_info_t, fs) {
+                l = str_size(fs->vfs_info.name) + 1;
+                memcpy(fstypes->buf + size, fs->vfs_info.name, l);
+                fstypes->fstypes[count] = &fstypes->buf[size];
+                size += l;
+                count++;
+        }
+
+        fibril_mutex_unlock(&fs_list_lock);
+        return EOK;
+}
+
 /**
  * @}